Merge pull request #1058 from openziti/v2.0

zrok v2.0

Author: michaelquigley

.github/workflows/build-wheels.yml

@@ -62,7 +62,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: zrok_sdk_distributions
+          name: zrok2_sdk_distributions
           path: sdk/python/src/dist/*
 
   publish_testpypi:
@@ -77,7 +77,7 @@ jobs:
         with:
           path: sdk/python/src/dist
           merge-multiple: true
-          pattern: zrok_sdk_distributions
+          pattern: zrok2_sdk_distributions
 
       - name: Publish Distributions to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
@@ -99,7 +99,7 @@ jobs:
         with:
           path: sdk/python/src/dist
           merge-multiple: true
-          pattern: zrok_sdk_distributions
+          pattern: zrok2_sdk_distributions
 
       - name: Publish Distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/ci-build.yml

@@ -29,7 +29,7 @@ jobs:
       - name: setup-node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - name: install ui node modules
         shell: bash
@@ -55,7 +55,7 @@ jobs:
 
       - name: go install
         shell: bash
-        run: go install -ldflags "-X github.com/openziti/zrok/build.Version=${{ github.ref }} -X github.com/openziti/zrok/build.Hash=${{ github.sha }}" ./...
+        run: go install -ldflags "-X github.com/openziti/zrok/v2/build.Version=${{ github.ref }} -X github.com/openziti/zrok/v2/build.Hash=${{ github.sha }}" ./...
 
       - name: go test
         shell: bash
@@ -72,7 +72,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: linux-amd64
-          path: ${{ steps.solve_go_bin.outputs.go_bin }}/zrok
+          path: ${{ steps.solve_go_bin.outputs.go_bin }}/zrok2
           if-no-files-found: error
 
   windows-build:
@@ -122,7 +122,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: windows-amd64
-          path: ./dist/**/zrok.exe
+          path: ./dist/**/zrok2.exe
           if-no-files-found: error
 
   pytest:
@@ -213,7 +213,7 @@ jobs:
 
       - name: Set Up Container Image Tags for zrok CLI Container
         env:
-          ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok' }}
+          ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok2' }}
           ZROK_CONTAINER_IMAGE_TAG: ${{ steps.slug.outputs.branch_tag }}
         id: tagprep_cli
         shell: bash

.github/workflows/deploy-doc-site.yml

@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   build:
+    if: github.repository_owner == 'openziti'
     runs-on: ubuntu-latest
 
     steps:
@@ -19,7 +20,7 @@ jobs:
       - uses: actions/setup-node@v4
         name: setup npm
         with:
-          node-version: 18
+          node-version: 22
           check-latest: true
           cache: "npm"
           cache-dependency-path: website/package-lock.json

.github/workflows/homebrew.yml

@@ -8,6 +8,7 @@ jobs:
   enforce_stable_semver:
     name: Require Stable Release Semver
     runs-on: ubuntu-24.04
+    if: vars.ZROK_SKIP_HOMEBREW != 'true'
     outputs:
       version: ${{ steps.parse.outputs.version }}
     steps:
@@ -25,7 +26,7 @@ jobs:
 
   brew_formula:
     needs: enforce_stable_semver
-    if: github.repository_owner == 'openziti' || github.repository_owner == 'openziti-test-kitchen'
+    if: (github.repository_owner == 'openziti' || github.repository_owner == 'openziti-test-kitchen') && vars.ZROK_SKIP_HOMEBREW != 'true'
     runs-on: ubuntu-24.04
     steps:
 
@@ -56,8 +57,8 @@ jobs:
       - name: Upload Release Source Archive to Homebrew
         uses: mislav/bump-homebrew-formula-action@v3.2
         with:
-          formula-name: zrok
-          formula-path: Formula/z/zrok.rb
+          formula-name: zrok2
+          formula-path: Formula/z/zrok2.rb
           download-url: https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/source-${{ github.ref_name }}.tar.gz
           download-sha256: ${{ steps.source.outputs.sha256 }}
           homebrew-tap: ${{ vars.ZROK_BREW_TAP || 'Homebrew/homebrew-core' }}

.github/workflows/node-sdk.yml

@@ -10,7 +10,7 @@ jobs:
 
   enforce_stable_semver:
     name: Require Stable Release Semver
-    if: github.event.action == 'released'
+    if: github.event.action == 'released' && vars.ZROK_SKIP_NODEJS != 'true'
     runs-on: ubuntu-24.04
     steps:
       - name: Parse Release Version
@@ -27,7 +27,10 @@ jobs:
 
   build:
     needs: enforce_stable_semver
-    if: always()
+    # rationale: run this job for merges to main and releases, but only if the ZROK_SKIP_NODEJS env var is not set to
+    # 'true' (e.g. for forks), and only perform the publishing steps in this job if the release event activity type is
+    # 'released' (i.e., stable, not a GH prerelease)
+    if: always() && vars.ZROK_SKIP_NODEJS != 'true'
     name: Build for Node-${{ matrix.node_ver }} ${{ matrix.config.target }}/${{ matrix.config.arch }}
     runs-on: ${{ matrix.config.os }}
     env:
@@ -38,7 +41,7 @@ jobs:
       matrix:
         config:
           - { os: ubuntu-24.04, target: "linux", arch: "x64" }
-        node_ver: [ 20 ]
+        node_ver: [ 22 ]
       fail-fast: false
 
     steps:

.github/workflows/promote-downstreams.yml

@@ -39,7 +39,7 @@ jobs:
       fail-fast: true
       matrix:
         image:
-          - repo: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'docker.io/openziti/zrok' }}
+          - repo: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'docker.io/openziti/zrok2' }}
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -61,9 +61,8 @@ jobs:
       fail-fast: true
       matrix:
         package_name:
-          - zrok
-          - zrok-share
-          - zrok-agent
+          - zrok2
+          - zrok2-agent
         arch:
           - deb: amd64
             rpm: x86_64

.github/workflows/publish-docker-images.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Set Up Container Image Tags for zrok CLI Container
         env:
-          ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok' }}
+          ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok2' }}
           ZROK_CONTAINER_IMAGE_TAG: ${{ steps.semver.outputs.zrok_semver }}
         id: tagprep_cli
         shell: bash
@@ -93,7 +93,7 @@ jobs:
       - name: Publish Attestations to GitHub
         uses: actions/attest-build-provenance@v1
         env:
-          IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok' }}
+          IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok2' }}
         with:
           subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/release.yml

@@ -45,7 +45,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - run: npm install
         working-directory: ui
@@ -97,7 +97,8 @@ jobs:
           else
             SEMVER_PRE=${SEMVER#*-}
           fi
-          for PAX in zrok{,-share,-agent}; do
+          # for PAX in zrok2{,-agent,-controller,-frontend,-metrics}; do
+          for PAX in zrok2{,-agent}; do
             _pattern="./dist/${PAX}-${SEMVER_CORE}${SEMVER_PRE:+~${SEMVER_PRE}}*.${ARCH}.rpm"
             if ! compgen -G "$_pattern" > /dev/null; then
               echo "ERROR: No RPM files found matching pattern '${_pattern}'" >&2
@@ -133,7 +134,8 @@ jobs:
           else
             SEMVER_PRE=${SEMVER#*-}
           fi
-          for PAX in zrok{,-share,-agent}; do
+          # for PAX in zrok2{,-agent,-controller,-frontend,-metrics}; do
+          for PAX in zrok2{,-agent}; do
             _pattern="./dist/${PAX}_${SEMVER_CORE}${SEMVER_PRE:+~${SEMVER_PRE}}*_${ARCH}.deb"
             if ! compgen -G "$_pattern" > /dev/null; then
               echo "ERROR: No DEB files found matching pattern '${_pattern}'" >&2
@@ -179,7 +181,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - run: npm install
         working-directory: ui
@@ -232,7 +234,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - run: npm install
         working-directory: ui

.gitignore

@@ -6,8 +6,7 @@
 CLAUDE.md
 *.db
 /automated-release-build/
-etc/dev.yml
-etc/dev-*
+etc/dev*
 etc/*.pem
 
 # Dependencies

.goreleaser-darwin.yml

@@ -1,9 +1,9 @@
 version: 2
 builds:
   - id: zrok-amd64
-    main: ./cmd/zrok
-    binary: zrok
-    ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
+    main: ./cmd/zrok2
+    binary: zrok2
+    ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}"
     env:
       - CGO_ENABLED=1
     goos:
@@ -12,16 +12,16 @@ builds:
       - amd64
     hooks:
       post:
-        - cmd: 'codesign -s "Developer ID Application: NetFoundry Inc" -v dist/zrok-amd64_darwin_amd64_v1/zrok --options=runtime'
+        - cmd: 'codesign -s "Developer ID Application: NetFoundry Inc" -v dist/zrok-amd64_darwin_amd64_v1/zrok2 --options=runtime'
           output: true
-        - cmd: zip "dist/zrok-amd64_darwin_amd64_v1/zrok.zip" dist/zrok-amd64_darwin_amd64_v1/zrok
-        - cmd: xcrun notarytool submit "dist/zrok-amd64_darwin_amd64_v1/zrok.zip" --apple-id {{ .Env.AC_USERNAME }} --password {{ .Env.AC_PASSWORD }} --team-id MN5S649TXM --wait
+        - cmd: zip "dist/zrok-amd64_darwin_amd64_v1/zrok2.zip" dist/zrok-amd64_darwin_amd64_v1/zrok2
+        - cmd: xcrun notarytool submit "dist/zrok-amd64_darwin_amd64_v1/zrok2.zip" --apple-id {{ .Env.AC_USERNAME }} --password {{ .Env.AC_PASSWORD }} --team-id MN5S649TXM --wait
           output: true
 
   - id: zrok-arm64
-    main: ./cmd/zrok
-    binary: zrok
-    ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
+    main: ./cmd/zrok2
+    binary: zrok2
+    ldflags: "-s -w -X github.com/openziti/zrok/v2/build.Version={{.Tag}} -X github.com/openziti/zrok/v2/build.Hash={{.ShortCommit}}"
     env:
       - CGO_ENABLED=1
     goos:
@@ -30,8 +30,8 @@ builds:
       - arm64
     hooks:
       post:
-        - cmd: 'codesign -s "Developer ID Application: NetFoundry Inc" -v dist/zrok-arm64_darwin_arm64_v8.0/zrok --options=runtime'
+        - cmd: 'codesign -s "Developer ID Application: NetFoundry Inc" -v dist/zrok-arm64_darwin_arm64_v8.0/zrok2 --options=runtime'
           output: true
-        - cmd: zip "dist/zrok-arm64_darwin_arm64_v8.0/zrok.zip" dist/zrok-arm64_darwin_arm64_v8.0/zrok
-        - cmd: xcrun notarytool submit "dist/zrok-arm64_darwin_arm64_v8.0/zrok.zip" --apple-id {{ .Env.AC_USERNAME }} --password {{ .Env.AC_PASSWORD }} --team-id MN5S649TXM --wait
+        - cmd: zip "dist/zrok-arm64_darwin_arm64_v8.0/zrok2.zip" dist/zrok-arm64_darwin_arm64_v8.0/zrok2
+        - cmd: xcrun notarytool submit "dist/zrok-arm64_darwin_arm64_v8.0/zrok2.zip" --apple-id {{ .Env.AC_USERNAME }} --password {{ .Env.AC_PASSWORD }} --team-id MN5S649TXM --wait
           output: true