From aa94b6bec67df1394885e2e75056336ec35d0777 Mon Sep 17 00:00:00 2001 From: Sandipan Panda Date: Wed, 29 Apr 2026 21:28:09 +0530 Subject: [PATCH 1/3] Fix secret placeholder in zxp installer yaml --- dist/install.yaml | 2 +- dist/installer_updater.yaml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dist/install.yaml b/dist/install.yaml index ccc73142..ac91126d 100644 --- a/dist/install.yaml +++ b/dist/install.yaml @@ -1435,7 +1435,7 @@ metadata: name: devzero-zxporter-token namespace: devzero-system stringData: - CLUSTER_TOKEN: "" + CLUSTER_TOKEN: "{{ .cluster_token }}" type: Opaque --- apiVersion: v1 diff --git a/dist/installer_updater.yaml b/dist/installer_updater.yaml index 46faa991..79f01b18 100644 --- a/dist/installer_updater.yaml +++ b/dist/installer_updater.yaml @@ -1369,15 +1369,6 @@ subjects: namespace: devzero-system --- apiVersion: v1 -kind: Secret -metadata: - name: devzero-zxporter-token - namespace: devzero-system -stringData: - CLUSTER_TOKEN: "{{ .cluster_token }}" -type: Opaque ---- -apiVersion: v1 kind: Service metadata: labels: From 1600456aca6166645d878b3b9c79e8a71c816ab5 Mon Sep 17 00:00:00 2001 From: Sandipan Panda Date: Wed, 29 Apr 2026 22:04:29 +0530 Subject: [PATCH 2/3] build installer fixes for secret --- Makefile | 6 ++++-- dist/backend-install.yaml | 2 +- dist/install.yaml | 2 +- dist/zxporter.yaml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d05239e5..069586e0 100644 --- a/Makefile +++ b/Makefile @@ -331,7 +331,7 @@ final-installer: .PHONY: installer-without-configmap installer-without-configmap: @cp $(DIST_BACKEND_INSTALL_BUNDLE) $(DIST_DIR)/installer_updater.yaml - @$(YQ) -i 'select(.kind != "ConfigMap" or .metadata.name != "devzero-zxporter-env-config")' $(DIST_DIR)/installer_updater.yaml + @$(YQ) -i 'select((.kind != "ConfigMap" or .metadata.name != "devzero-zxporter-env-config") and (.kind != "Secret" or .metadata.name != "devzero-zxporter-token"))' $(DIST_DIR)/installer_updater.yaml .PHONY: build-installer build-installer: manifests generate kustomize yq ## Generate a consolidated YAML with deployment. @@ -385,7 +385,9 @@ build-installer: manifests generate kustomize yq ## Generate a consolidated YAML @$(KUSTOMIZE) build config/default > $(DIST_ZXPORTER_BUNDLE) @echo "[INFO] Patching cluster token into generated bundle" - @sed "s|CLUSTER_TOKEN: '{{ .cluster_token }}'|CLUSTER_TOKEN: \"$(CLUSTER_TOKEN)\"|g" $(DIST_ZXPORTER_BUNDLE) > $(DIST_ZXPORTER_BUNDLE).tmp && mv $(DIST_ZXPORTER_BUNDLE).tmp $(DIST_ZXPORTER_BUNDLE) + @if [ -n "$(CLUSTER_TOKEN)" ]; then \ + sed "s|CLUSTER_TOKEN: '{{ .cluster_token }}'|CLUSTER_TOKEN: \"$(CLUSTER_TOKEN)\"|g" $(DIST_ZXPORTER_BUNDLE) > $(DIST_ZXPORTER_BUNDLE).tmp && mv $(DIST_ZXPORTER_BUNDLE).tmp $(DIST_ZXPORTER_BUNDLE); \ + fi @cat $(DIST_ZXPORTER_BUNDLE) >> $(DIST_INSTALL_BUNDLE) @echo "[INFO] Building backend installer" diff --git a/dist/backend-install.yaml b/dist/backend-install.yaml index 97757fad..b0080c87 100644 --- a/dist/backend-install.yaml +++ b/dist/backend-install.yaml @@ -1430,7 +1430,7 @@ metadata: name: devzero-zxporter-token namespace: devzero-system stringData: - CLUSTER_TOKEN: "{{ .cluster_token }}" + CLUSTER_TOKEN: '{{ .cluster_token }}' type: Opaque --- apiVersion: v1 diff --git a/dist/install.yaml b/dist/install.yaml index ac91126d..6af3b5e7 100644 --- a/dist/install.yaml +++ b/dist/install.yaml @@ -1435,7 +1435,7 @@ metadata: name: devzero-zxporter-token namespace: devzero-system stringData: - CLUSTER_TOKEN: "{{ .cluster_token }}" + CLUSTER_TOKEN: '{{ .cluster_token }}' type: Opaque --- apiVersion: v1 diff --git a/dist/zxporter.yaml b/dist/zxporter.yaml index 21f14ac4..b97b1a48 100644 --- a/dist/zxporter.yaml +++ b/dist/zxporter.yaml @@ -614,7 +614,7 @@ metadata: name: devzero-zxporter-token namespace: devzero-system stringData: - CLUSTER_TOKEN: "" + CLUSTER_TOKEN: '{{ .cluster_token }}' type: Opaque --- apiVersion: v1 From 4308e848f9739dfa5a4082444b07621c16b217ec Mon Sep 17 00:00:00 2001 From: Sandipan Panda Date: Thu, 30 Apr 2026 18:42:21 +0530 Subject: [PATCH 3/3] ns fix --- Makefile | 1 + dist/backend-install.yaml | 2 +- dist/installer_updater.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 069586e0..c5482150 100644 --- a/Makefile +++ b/Makefile @@ -321,6 +321,7 @@ final-installer: @$(YQ) -i '(select(.kind == "ConfigMap" and .metadata.name == "devzero-zxporter-env-config") | .data.DAKR_URL) = "{{ .api_url }}/dakr"' $(DIST_BACKEND_INSTALL_BUNDLE) @$(YQ) -i '(select(.kind == "Deployment") | .spec.template.spec.containers[]? | select(.image == "ttl.sh/zxporter:latest")).image = "docker.io/devzeroinc/zxporter:latest"' $(DIST_BACKEND_INSTALL_BUNDLE) @$(YQ) -i '(select(.kind == "Secret" and .metadata.name == "devzero-zxporter-token") | .stringData.CLUSTER_TOKEN) = "{{ .cluster_token }}"' $(DIST_BACKEND_INSTALL_BUNDLE) + @$(YQ) -i '(select(.kind == "Namespace" and .metadata.labels."app.kubernetes.io/managed-by" == "kustomize") | .metadata.name) = "{{.zxporter_namespace}}"' $(DIST_BACKEND_INSTALL_BUNDLE) @$(MAKE) installer-without-configmap @if [ -d "$(DAKR_DIR)/services/dakr_installers" ]; then \ cp $(DIST_BACKEND_INSTALL_BUNDLE) $(DAKR_DIR)/services/dakr_installers/install.yaml; \ diff --git a/dist/backend-install.yaml b/dist/backend-install.yaml index b0080c87..d283fe2b 100644 --- a/dist/backend-install.yaml +++ b/dist/backend-install.yaml @@ -821,7 +821,7 @@ metadata: app.kubernetes.io/managed-by: kustomize app.kubernetes.io/name: devzero-zxporter control-plane: controller-manager - name: devzero-system + name: '{{.zxporter_namespace}}' --- apiVersion: v1 kind: ServiceAccount diff --git a/dist/installer_updater.yaml b/dist/installer_updater.yaml index 79f01b18..b77c3ada 100644 --- a/dist/installer_updater.yaml +++ b/dist/installer_updater.yaml @@ -821,7 +821,7 @@ metadata: app.kubernetes.io/managed-by: kustomize app.kubernetes.io/name: devzero-zxporter control-plane: controller-manager - name: devzero-system + name: '{{.zxporter_namespace}}' --- apiVersion: v1 kind: ServiceAccount