From 221369bdcd10460f59c2f5aac2a9d102079da3bb Mon Sep 17 00:00:00 2001 From: bnallapeta Date: Fri, 1 Mar 2024 10:03:55 +0530 Subject: [PATCH 1/3] Add make target to remove labels and annotations from manifests --- .github/workflows/push.yaml | 3 +++ Makefile | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 957ebe46..7adf86fe 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -205,6 +205,9 @@ jobs: helm template reloader deployments/kubernetes/chart/reloader/ > deployments/kubernetes/reloader.yaml helm template reloader deployments/kubernetes/chart/reloader/ --output-dir deployments/kubernetes/manifests && mv deployments/kubernetes/manifests/reloader/templates/* deployments/kubernetes/manifests/ && rm -r deployments/kubernetes/manifests/reloader + - name: Remove labels and annotations from manifests + run: make remove-labels-annotations + # Publish helm chart - name: Login to ghcr via helm run: | diff --git a/Makefile b/Makefile index 73370471..ff0f6dfc 100644 --- a/Makefile +++ b/Makefile @@ -86,3 +86,21 @@ bump-chart: sed -i "s/^appVersion:.*/appVersion: v$(VERSION)/" deployments/kubernetes/chart/reloader/Chart.yaml sed -i "s/tag:.*/tag: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml sed -i "s/version:.*/version: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml + +YQ_VERSION = v4.42.1 +YQ_BIN = $(shell pwd)/yq +CURRENT_ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') + +YQ_DOWNLOAD_URL = "https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_linux_$(CURRENT_ARCH)" + +yq-install: + @echo "Downloading yq $(YQ_VERSION) for linux/$(CURRENT_ARCH)" + @curl -sL $(YQ_DOWNLOAD_URL) -o $(YQ_BIN) + @chmod +x $(YQ_BIN) + @echo "yq $(YQ_VERSION) installed at $(YQ_BIN)" + +remove-labels-annotations: yq-install + @for file in $$(find deployments/kubernetes/manifests -type f -name '*.yaml'); do \ + echo "Processing $$file"; \ + $(YQ_BIN) eval 'del(.metadata.labels, .metadata.annotations)' -i "$$file"; \ + done From 08b02e0797f8f89556dead826018f88874b4bb4d Mon Sep 17 00:00:00 2001 From: bnallapeta Date: Mon, 4 Mar 2024 17:10:30 +0530 Subject: [PATCH 2/3] Remove labels and annotations from Kubernetes deployment.yaml --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ff0f6dfc..88b2e591 100644 --- a/Makefile +++ b/Makefile @@ -104,3 +104,4 @@ remove-labels-annotations: yq-install echo "Processing $$file"; \ $(YQ_BIN) eval 'del(.metadata.labels, .metadata.annotations)' -i "$$file"; \ done + $(YQ_BIN) eval 'del(.spec.template.metadata.labels)' -i deployments/kubernetes/manifests/deployment.yaml From 352f6ff230c121234914965126690cfbb5a5db7e Mon Sep 17 00:00:00 2001 From: bnallapeta Date: Thu, 7 Mar 2024 11:42:55 +0530 Subject: [PATCH 3/3] Update deployment.yaml with reloader-reloader labels and selector --- Makefile | 3 + .../kubernetes/manifests/deployment.yaml | 55 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 88b2e591..5a2a6c2b 100644 --- a/Makefile +++ b/Makefile @@ -105,3 +105,6 @@ remove-labels-annotations: yq-install $(YQ_BIN) eval 'del(.metadata.labels, .metadata.annotations)' -i "$$file"; \ done $(YQ_BIN) eval 'del(.spec.template.metadata.labels)' -i deployments/kubernetes/manifests/deployment.yaml + $(YQ_BIN) eval 'del(.spec.selector.matchLabels)' -i deployments/kubernetes/manifests/deployment.yaml + $(YQ_BIN) eval '.spec.selector.matchLabels.app = "reloader-reloader"' -i deployments/kubernetes/manifests/deployment.yaml + $(YQ_BIN) eval '.spec.template.metadata.labels.app = "reloader-reloader"' -i deployments/kubernetes/manifests/deployment.yaml diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 3ebcdd5f..df741cbf 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -37,35 +37,32 @@ spec: version: v1.0.69 spec: containers: - - image: "ghcr.io/stakater/reloader:v1.0.69" - imagePullPolicy: IfNotPresent - name: reloader-reloader - - ports: - - name: http - containerPort: 9090 - livenessProbe: - httpGet: - path: /live - port: http - timeoutSeconds: 5 - failureThreshold: 5 - periodSeconds: 10 - successThreshold: 1 - initialDelaySeconds: 10 - readinessProbe: - httpGet: - path: /metrics - port: http - timeoutSeconds: 5 - failureThreshold: 5 - periodSeconds: 10 - successThreshold: 1 - initialDelaySeconds: 10 - - securityContext: - {} - securityContext: + - image: "ghcr.io/stakater/reloader:v1.0.69" + imagePullPolicy: IfNotPresent + name: reloader-reloader + ports: + - name: http + containerPort: 9090 + livenessProbe: + httpGet: + path: /live + port: http + timeoutSeconds: 5 + failureThreshold: 5 + periodSeconds: 10 + successThreshold: 1 + initialDelaySeconds: 10 + readinessProbe: + httpGet: + path: /metrics + port: http + timeoutSeconds: 5 + failureThreshold: 5 + periodSeconds: 10 + successThreshold: 1 + initialDelaySeconds: 10 + securityContext: {} + securityContext: runAsNonRoot: true runAsUser: 65534 serviceAccountName: reloader-reloader