chore: upgrade dev tooling and helm chart dependencies (#372)

dejanzele · web-flow · commit f99ff607f608 · 2026-01-06T02:22:52.000+01:00
Signed-off-by: Dejan Zele Pejchev &lt;pejcev.dejan@gmail.com&gt;
diff --git a/Makefile b/Makefile
@@ -283,7 +283,7 @@ wait-for-armada: ## Wait for all Armada pods
 .PHONY: uninstall-armada-deps
 uninstall-armada-deps: helm-uninstall-kube-prometheus-stack helm-uninstall-postgres helm-uninstall-pulsar helm-uninstall-redis ## Uninstall required Armada dependencies (Prometheus, PostgreSQL, Pulsar, Redis).
 
-CERT_MANAGER_MANIFEST ?= "https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml"
+CERT_MANAGER_MANIFEST ?= "https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml"
 .PHONY: install-cert-manager
 install-cert-manager: ## Install cert-manager.
 	kubectl apply -f ${CERT_MANAGER_MANIFEST}
@@ -317,7 +317,7 @@ helm-repos: ## Add helm repos for external dependencies.
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update
 
-CERT_MANAGER_VERSION ?= v1.14.5
+CERT_MANAGER_VERSION ?= v1.19.2
 .PHONY: helm-install-cert-manager
 helm-install-cert-manager:
 	helm upgrade --install cert-manager jetstack/cert-manager \
@@ -328,31 +328,31 @@ helm-install-cert-manager:
 
 .PHONY: helm-install-pulsar
 helm-install-pulsar: helm-repos ## Install Apache Pulsar using Helm.
-	helm upgrade --install pulsar apache/pulsar --version 4.1.0 --values dev/quickstart/pulsar.values.yaml --create-namespace --namespace data
+	helm upgrade --install pulsar apache/pulsar --version 4.4.0 --values dev/quickstart/pulsar.values.yaml --create-namespace --namespace data
 
 .PHONY: helm-uninstall-pulsar
 helm-uninstall-pulsar: ## Uninstall Apache Pulsar using Helm.
 	helm uninstall pulsar --namespace data
 
 .PHONY: helm-install-postgres
 helm-install-postgres: helm-repos ## Install PostgreSQL using Helm.
-	helm upgrade --install postgresql groundhog2k/postgres --version 1.5.8 --values dev/quickstart/postgres.values.yaml --create-namespace --namespace data
+	helm upgrade --install postgresql groundhog2k/postgres --version 1.6.1 --values dev/quickstart/postgres.values.yaml --create-namespace --namespace data
 
 .PHONY: helm-uninstall-postgres
 helm-uninstall-postgres: ## Uninstall PostgreSQL using Helm.
 	helm uninstall postgresql --namespace data
 
 .PHONY: helm-install-redis
 helm-install-redis: helm-repos ## Install Redis using Helm.
-	helm upgrade --install redis-ha dandydev/redis-ha --version 4.34.13 --values dev/quickstart/redis.values.yaml --create-namespace --namespace data
+	helm upgrade --install redis-ha dandydev/redis-ha --version 4.35.5 --values dev/quickstart/redis.values.yaml --create-namespace --namespace data
 
 .PHONY: helm-uninstall-redis
 helm-uninstall-redis: ## Uninstall Redis using Helm.
 	helm uninstall redis --namespace data
 
 .PHONY: helm-install-kube-prometheus-stack
 helm-install-kube-prometheus-stack: helm-repos ## Install kube-prometheus-stack using Helm.
-	helm upgrade --install kube-prometheus-stack --version 72.6.4 --values dev/quickstart/kube-prometheus-stack.values.yaml prometheus-community/kube-prometheus-stack --create-namespace --namespace monitoring
+	helm upgrade --install kube-prometheus-stack --version 80.6.0 --values dev/quickstart/kube-prometheus-stack.values.yaml prometheus-community/kube-prometheus-stack --create-namespace --namespace monitoring
 
 .PHONY: helm-uninstall-kube-prometheus-stack
 helm-uninstall-kube-prometheus-stack: ## Uninstall kube-prometheus-stack using Helm.
@@ -372,7 +372,7 @@ GORELEASER ?= $(LOCALBIN_TOOLING)/goreleaser
 CRD_REF_DOCS ?= $(LOCALBIN_TOOLING)/crd-ref-docs
 GOLANGCI_LINT ?= $(LOCALBIN_TOOLING)/golangci-lint
 
-KUSTOMIZE_VERSION ?= v5.6.0
+KUSTOMIZE_VERSION ?= v5.8.0
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -390,7 +390,7 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN_TOOLING)
 	test -s $(ENVTEST) || GOBIN=$(LOCALBIN_TOOLING) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
-GOTESTSUM_VERSION ?= v1.12.0
+GOTESTSUM_VERSION ?= v1.13.0
 .PHONY: gotestsum
 gotestsum: $(GOTESTSUM) ## Download gotestsum locally if necessary.
 $(GOTESTSUM): $(LOCALBIN_TOOLING)
@@ -402,25 +402,25 @@ mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
 $(MOCKGEN): $(LOCALBIN_TOOLING)
 	test -s $(MOCKGEN) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/golang/mock/mockgen@$(MOCKGEN_VERSION)
 
-KIND_VERSION ?= v0.27.0
+KIND_VERSION ?= v0.31.0
 .PHONY: kind
 kind: $(KIND) ## Download kind locally if necessary.
 $(KIND): $(LOCALBIN_TOOLING)
 	test -s $(KIND) || GOBIN=$(LOCALBIN_TOOLING) go install sigs.k8s.io/kind@$(KIND_VERSION)
 
-HELMIFY_VERSION ?= v0.4.17
+HELMIFY_VERSION ?= v0.4.19
 .PHONY: helmify
 helmify: $(HELMIFY) ## Download helmify locally if necessary.
 $(HELMIFY): $(LOCALBIN_TOOLING)
 	test -s $(HELMIFY) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/arttor/helmify/cmd/helmify@$(HELMIFY_VERSION)
 
-GORELEASER_VERSION ?= v2.7.0
+GORELEASER_VERSION ?= v2.13.2
 .PHONY: goreleaser
 goreleaser: $(GORELEASER) ## Download GoReleaser locally if necessary.
 $(GORELEASER): $(LOCALBIN_TOOLING)
 	test -s $(GORELEASER) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION)
 
-CRD_REF_DOCS_VERSION ?= v0.1.0
+CRD_REF_DOCS_VERSION ?= v0.2.0
 .PHONY: crd-ref-docs
 crd-ref-docs: $(CRD_REF_DOCS) ## Download crd-ref-docs locally if necessary.
 $(CRD_REF_DOCS): $(LOCALBIN_TOOLING)
diff --git a/charts/armada-operator/crds/armadaserver-crd.yaml b/charts/armada-operator/crds/armadaserver-crd.yaml
@@ -2760,3 +2760,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/binoculars-crd.yaml b/charts/armada-operator/crds/binoculars-crd.yaml
@@ -2759,3 +2759,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/eventingester-crd.yaml b/charts/armada-operator/crds/eventingester-crd.yaml
@@ -2722,3 +2722,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/executor-crd.yaml b/charts/armada-operator/crds/executor-crd.yaml
@@ -2735,3 +2735,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/lookout-crd.yaml b/charts/armada-operator/crds/lookout-crd.yaml
@@ -2767,3 +2767,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/lookoutingester-crd.yaml b/charts/armada-operator/crds/lookoutingester-crd.yaml
@@ -2722,3 +2722,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/queue-crd.yaml b/charts/armada-operator/crds/queue-crd.yaml
@@ -62,3 +62,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/scheduler-crd.yaml b/charts/armada-operator/crds/scheduler-crd.yaml
@@ -2843,3 +2843,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/crds/scheduleringester-crd.yaml b/charts/armada-operator/crds/scheduleringester-crd.yaml
@@ -2722,3 +2722,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/charts/armada-operator/templates/deployment.yaml b/charts/armada-operator/templates/deployment.yaml
@@ -88,12 +88,16 @@ spec:
           10 }}
         securityContext: {{- toYaml .Values.controllerManager.kubeRbacProxy.containerSecurityContext
           | nindent 10 }}
+      nodeSelector: {{- toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
       securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
         8 }}
-      serviceAccountName: {{ include "armada-operator.fullname" . }}-controller-manager
+      serviceAccountName: {{ include "armada-operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
+      tolerations: {{- toYaml .Values.controllerManager.tolerations | nindent 8 }}
+      topologySpreadConstraints: {{- toYaml .Values.controllerManager.topologySpreadConstraints
+        | nindent 8 }}
       volumes:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: webhook-server-cert
+          secretName: webhook-server-cert
diff --git a/charts/armada-operator/templates/leader-election-rbac.yaml b/charts/armada-operator/templates/leader-election-rbac.yaml
@@ -56,5 +56,5 @@ roleRef:
   name: '{{ include "armada-operator.fullname" . }}-leader-election-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "armada-operator.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  name: '{{ include "armada-operator.serviceAccountName" . }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/charts/armada-operator/templates/manager-rbac.yaml b/charts/armada-operator/templates/manager-rbac.yaml
@@ -267,5 +267,5 @@ roleRef:
   name: '{{ include "armada-operator.fullname" . }}-manager-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "armada-operator.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  name: '{{ include "armada-operator.serviceAccountName" . }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/charts/armada-operator/templates/metrics-reader-rbac.yaml b/charts/armada-operator/templates/metrics-reader-rbac.yaml
@@ -11,4 +11,4 @@ rules:
 - nonResourceURLs:
   - /metrics
   verbs:
-  - get
+  - get
diff --git a/charts/armada-operator/templates/metrics-service.yaml b/charts/armada-operator/templates/metrics-service.yaml
@@ -14,4 +14,4 @@ spec:
     control-plane: controller-manager
     {{- include "armada-operator.selectorLabels" . | nindent 4 }}
   ports:
-  {{- .Values.metricsService.ports | toYaml | nindent 2 }}
+  {{- .Values.metricsService.ports | toYaml | nindent 2 }}
diff --git a/charts/armada-operator/templates/mutating-webhook-configuration.yaml b/charts/armada-operator/templates/mutating-webhook-configuration.yaml
@@ -186,4 +186,4 @@ webhooks:
     - UPDATE
     resources:
     - armadaservers
-  sideEffects: None
+  sideEffects: None
diff --git a/charts/armada-operator/templates/proxy-rbac.yaml b/charts/armada-operator/templates/proxy-rbac.yaml
@@ -36,5 +36,5 @@ roleRef:
   name: '{{ include "armada-operator.fullname" . }}-proxy-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "armada-operator.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  name: '{{ include "armada-operator.serviceAccountName" . }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/charts/armada-operator/templates/selfsigned-issuer.yaml b/charts/armada-operator/templates/selfsigned-issuer.yaml
@@ -5,4 +5,4 @@ metadata:
   labels:
   {{- include "armada-operator.labels" . | nindent 4 }}
 spec:
-  selfSigned: {}
+  selfSigned: {}
diff --git a/charts/armada-operator/templates/serviceaccount.yaml b/charts/armada-operator/templates/serviceaccount.yaml
@@ -1,11 +1,13 @@
+{{ if .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "armada-operator.fullname" . }}-controller-manager
+  name: {{ include "armada-operator.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: armada-operator
-    app.kubernetes.io/part-of: armada-operator
   {{- include "armada-operator.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
   annotations:
-    {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
diff --git a/charts/armada-operator/templates/serving-cert.yaml b/charts/armada-operator/templates/serving-cert.yaml
@@ -13,4 +13,4 @@ spec:
   issuerRef:
     kind: Issuer
     name: '{{ include "armada-operator.fullname" . }}-selfsigned-issuer'
-  secretName: webhook-server-cert
+  secretName: webhook-server-cert
diff --git a/charts/armada-operator/templates/validating-webhook-configuration.yaml b/charts/armada-operator/templates/validating-webhook-configuration.yaml
@@ -86,4 +86,4 @@ webhooks:
     - UPDATE
     resources:
     - scheduleringesters
-  sideEffects: None
+  sideEffects: None
diff --git a/charts/armada-operator/templates/webhook-service.yaml b/charts/armada-operator/templates/webhook-service.yaml
@@ -13,4 +13,4 @@ spec:
     control-plane: controller-manager
     {{- include "armada-operator.selectorLabels" . | nindent 4 }}
   ports:
-  {{- .Values.webhookService.ports | toYaml | nindent 2 }}
+  {{- .Values.webhookService.ports | toYaml | nindent 2 }}
diff --git a/charts/armada-operator/values.yaml b/charts/armada-operator/values.yaml
@@ -41,11 +41,12 @@ controllerManager:
       requests:
         cpu: 10m
         memory: 64Mi
+  nodeSelector: {}
   podSecurityContext:
     runAsNonRoot: false
   replicas: 1
-  serviceAccount:
-    annotations: {}
+  tolerations: []
+  topologySpreadConstraints: []
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports:
@@ -54,6 +55,11 @@ metricsService:
     protocol: TCP
     targetPort: https
   type: ClusterIP
+serviceAccount:
+  annotations: {}
+  automount: true
+  create: true
+  name: ""
 webhookService:
   ports:
   - port: 443
