Skip to content

scope namespace placeholder to installer_updater.yaml #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sandipanpanda wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −25
Open

scope namespace placeholder to installer_updater.yaml #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ 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; \
Expand All @@ -333,6 +332,11 @@ final-installer:
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") and (.kind != "Secret" or .metadata.name != "devzero-zxporter-token"))' $(DIST_DIR)/installer_updater.yaml
@sed \
-e "s|^ name: $(DEVZERO_MONITORING_NAMESPACE)$$| name: '{{.zxporter_namespace}}'|g" \
-e "s|^ namespace: $(DEVZERO_MONITORING_NAMESPACE)$$| namespace: '{{.zxporter_namespace}}'|g" \
-e "s|^ namespace: $(DEVZERO_MONITORING_NAMESPACE)$$| namespace: '{{.zxporter_namespace}}'|g" \
$(DIST_DIR)/installer_updater.yaml > $(DIST_DIR)/installer_updater.yaml.tmp && mv $(DIST_DIR)/installer_updater.yaml.tmp $(DIST_DIR)/installer_updater.yaml
Comment on lines +335 to +339
Copy link
Copy Markdown

@gitar-bot gitar-bot Bot May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Edge Case: sed patterns break if DEVZERO_MONITORING_NAMESPACE is empty

If DEVZERO_MONITORING_NAMESPACE is explicitly set to an empty string (e.g., make DEVZERO_MONITORING_NAMESPACE=), the sed patterns degenerate to matching lines like ^ name: $, which would not match intended lines but could silently skip all replacements, producing an installer_updater.yaml without namespace placeholders. Consider adding a guard check.

Add a guard to fail early if DEVZERO_MONITORING_NAMESPACE is empty:

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") and (.kind != "Secret" or .metadata.name != "devzero-zxporter-token"))' $(DIST_DIR)/installer_updater.yaml
	@if [ -z "$(DEVZERO_MONITORING_NAMESPACE)" ]; then echo "ERROR: DEVZERO_MONITORING_NAMESPACE must be set" >&2; exit 1; fi
	@sed \
		-e "s|^  name: $(DEVZERO_MONITORING_NAMESPACE)$$|  name: '{{.zxporter_namespace}}'|g" \
		-e "s|^  namespace: $(DEVZERO_MONITORING_NAMESPACE)$$|  namespace: '{{.zxporter_namespace}}'|g" \
		-e "s|^    namespace: $(DEVZERO_MONITORING_NAMESPACE)$$|    namespace: '{{.zxporter_namespace}}'|g" \
		$(DIST_DIR)/installer_updater.yaml > $(DIST_DIR)/installer_updater.yaml.tmp && mv $(DIST_DIR)/installer_updater.yaml.tmp $(DIST_DIR)/installer_updater.yaml

Was this helpful? React with 👍 / 👎


.PHONY: build-installer
build-installer: manifests generate kustomize yq ## Generate a consolidated YAML with deployment.
Expand Down
2 changes: 1 addition & 1 deletion dist/backend-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ metadata:
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: devzero-zxporter
control-plane: controller-manager
name: '{{.zxporter_namespace}}'
name: devzero-system
---
apiVersion: v1
kind: ServiceAccount
Expand Down
46 changes: 23 additions & 23 deletions dist/installer_updater.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: devzero-system
name: devzero-system
name: '{{.zxporter_namespace}}'
# ----- START PROM SERVER -----
---
# Source: prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml
Expand All @@ -29,7 +29,7 @@ metadata:
app.kubernetes.io/instance: prometheus
app.kubernetes.io/version: "2.15.0"
name: prometheus-kube-state-metrics
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
# Source: prometheus/templates/serviceaccount.yaml
apiVersion: v1
Expand All @@ -43,7 +43,7 @@ metadata:
helm.sh/chart: prometheus-27.20.0
app.kubernetes.io/part-of: dz-prometheus
name: prometheus-dz-prometheus-server
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
annotations: {}
---
# Source: prometheus/templates/cm.yaml
Expand All @@ -58,7 +58,7 @@ metadata:
helm.sh/chart: prometheus-27.20.0
app.kubernetes.io/part-of: dz-prometheus
name: prometheus-dz-prometheus-server
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
data:
allow-snippet-annotations: "false"
alerting_rules.yml: |
Expand Down Expand Up @@ -336,7 +336,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: prometheus-kube-state-metrics
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
# Source: prometheus/templates/clusterrolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -353,7 +353,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: prometheus-dz-prometheus-server
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -364,7 +364,7 @@ apiVersion: v1
kind: Service
metadata:
name: prometheus-kube-state-metrics
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
labels:
helm.sh/chart: kube-state-metrics-5.33.2
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -398,7 +398,7 @@ metadata:
helm.sh/chart: prometheus-27.20.0
app.kubernetes.io/part-of: dz-prometheus
name: prometheus-dz-prometheus-server
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
ports:
- name: http
Expand All @@ -417,7 +417,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: prometheus-kube-state-metrics
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
labels:
helm.sh/chart: kube-state-metrics-5.33.2
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -514,7 +514,7 @@ metadata:
helm.sh/chart: prometheus-27.20.0
app.kubernetes.io/part-of: dz-prometheus
name: prometheus-dz-prometheus-server
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -637,7 +637,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: dz-prometheus-node-exporter
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
labels:
helm.sh/chart: prometheus-node-exporter-4.47.0
app.kubernetes.io/managed-by: Helm
Expand All @@ -653,7 +653,7 @@ apiVersion: v1
kind: Service
metadata:
name: dz-prometheus-node-exporter
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
labels:
helm.sh/chart: prometheus-node-exporter-4.47.0
app.kubernetes.io/managed-by: Helm
Expand All @@ -680,7 +680,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: dz-prometheus-node-exporter
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
labels:
helm.sh/chart: prometheus-node-exporter-4.47.0
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -830,7 +830,7 @@ metadata:
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: devzero-zxporter
name: devzero-zxporter-controller-manager
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -839,7 +839,7 @@ metadata:
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: devzero-zxporter
name: devzero-zxporter-leader-election-role
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -1329,15 +1329,15 @@ metadata:
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/name: devzero-zxporter
name: devzero-zxporter-leader-election-rolebinding
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: devzero-zxporter-leader-election-role
subjects:
- kind: ServiceAccount
name: devzero-zxporter-controller-manager
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -1353,7 +1353,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: devzero-zxporter-controller-manager
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -1366,7 +1366,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: devzero-zxporter-controller-manager
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
---
apiVersion: v1
kind: Service
Expand All @@ -1376,7 +1376,7 @@ metadata:
app.kubernetes.io/name: devzero-zxporter
control-plane: controller-manager
name: devzero-zxporter-controller-manager-metrics-service
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
ports:
- name: https
Expand All @@ -1393,7 +1393,7 @@ metadata:
app.kubernetes.io/name: devzero-zxporter
control-plane: controller-manager
name: devzero-zxporter-controller-manager-mpa
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
ports:
- name: mpa-grpc
Expand Down Expand Up @@ -1421,7 +1421,7 @@ metadata:
app.kubernetes.io/name: devzero-zxporter
control-plane: controller-manager
name: devzero-zxporter-controller-manager
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
replicas: 2
selector:
Expand Down Expand Up @@ -1498,7 +1498,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: devzero-zxporter-devzero-zxporter-pdb
namespace: devzero-system
namespace: '{{.zxporter_namespace}}'
spec:
minAvailable: 1
selector:
Expand Down
Loading