override sidecar image

netfoundry · Jan 21, 2025 · 9ffcdb3 · 9ffcdb3
1 parent b9f400e
commit 9ffcdb3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -550,12 +550,21 @@ jobs:
         shell: bash
         env:
           ZITI_AGENT_IMAGE: netfoundry/ziti-k8s-agent:${{ github.run_id }}
-          ZITI_AGENT_NAMESPACE: ziti  # must be new because of the way this test is written
+          ZITI_AGENT_NAMESPACE: ziti-agent  # this test assumes the namespace does not exist and will be created during the test
+          ZITI_AGENT_LOG_LEVEL: 4
+          SIDECAR_IMAGE: ${{ vars.SIDECAR_IMAGE || 'docker.io/openziti/ziti-tunnel' }} 
+          SIDECAR_IMAGE_VERSION: ${{ vars.SIDECAR_IMAGE_VERSION || 'latest' }}
         run: |
           set -o pipefail
           set -o xtrace
 
+          # run the shell script to generate the k8s manifests, consuming env vars as configuration
           # IDENTITY_FILE exported in prior step create-nf-network-services
+          # ZITI_AGENT_IMAGE exported in this step environment
+          # ZITI_AGENT_NAMESPACE exported in this step environment
+          # ZITI_AGENT_LOG_LEVEL exported in this step environment
+          # SIDECAR_IMAGE exported in this step environment
+          # SIDECAR_IMAGE_VERSION exported in this step environment
           SIDECAR_SELECTORS=namespace \
           ./generate-ziti-agent-manifest.bash > ziti-k8s-agent-namespace-selector.yaml
           SIDECAR_SELECTORS=pod \

diff --git a/generate-ziti-agent-manifest.bash b/generate-ziti-agent-manifest.bash
@@ -110,7 +110,9 @@ spec:
             - containerPort: 9443
           args:
             - webhook
-            - --v=2
+            - --v=${ZITI_AGENT_LOG_LEVEL:-2}
+            - --sidecar-image="${SIDECAR_IMAGE:-docker.io/openziti/ziti-tunnel}"
+            - --sidecar-image-version="${SIDECAR_IMAGE_VERSION:-latest}"
           env:
             - name: TLS_CERT
               valueFrom:

diff --git a/ziti-agent/cmd/webhook/root.go b/ziti-agent/cmd/webhook/root.go
@@ -17,6 +17,7 @@ var (
 	sidecarImage           string
 	sidecarImageVersion    string
 	sidecarPrefix          string
+	sidecarIdentityDir     string
 	zitiCtrlMgmtApi        string
 	zitiCtrlClientCertFile string
 	zitiCtrlClientKeyFile  string
@@ -52,6 +53,8 @@ and takes appropriate actions, i.e. create/delete ziti identity, secret, etc.`,
 		"Image Varsion of sidecar")
 	webhookCmd.Flags().StringVar(&sidecarPrefix, "sidecar-prefix", "zt",
 		"Used in creation of ContainerName to be used as injected sidecar")
+	webhookCmd.Flags().StringVar(&sidecarIdentityDir, "sidecar-identity-dir", "/ziti-tunnel",
+		"Directory where sidecar container will store identity files")
 	webhookCmd.Flags().StringVar(&zitiCtrlMgmtApi, "ziti-ctrl-addr", "",
 		"Ziti Controller Management URL, i.e. https://{FQDN}:{PORT}/edge/management/v1 ")
 	webhookCmd.Flags().StringVar(&zitiCtrlClientCertFile, "ziti-ctrl-client-cert-file", "",