From 861bc06f33e76c3c58dcff68fd53e1f4a7ac7327 Mon Sep 17 00:00:00 2001 From: t3mi Date: Mon, 22 Sep 2025 20:14:20 +0000 Subject: [PATCH 1/2] fix(helm): add more customization options Signed-off-by: t3mi --- chart/templates/deployment.yaml | 25 +++++++++++++++++++++++++ chart/values.yaml | 12 ++++++++++++ 2 files changed, 37 insertions(+) diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 872e788a9..c08c547e7 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -9,10 +9,14 @@ metadata: app.kubernetes.io/name: deployment app.kubernetes.io/part-of: {{ .Values.name }} control-plane: {{ .Values.deployment.name }} + {{- with .Values.deployment.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} name: {{ .Values.deployment.name }} namespace: {{ .Release.Namespace }} spec: replicas: 1 + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} selector: matchLabels: app.kubernetes.io/created-by: {{ .Values.name }} @@ -30,6 +34,9 @@ spec: app.kubernetes.io/created-by: {{ .Values.name }} app.kubernetes.io/part-of: {{ .Values.name }} control-plane: {{ .Values.deployment.name }} + {{- with (.Values.pod).labels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: affinity: nodeAffinity: @@ -47,17 +54,35 @@ spec: operator: In values: - linux + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName }} + {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 6 }} {{- end }} + {{- with .Values.topologySpreadConstraints }} + topologySpreadConstraints: + {{- toYaml . | nindent 6 }} + {{- end }} containers: - args: - --health-probe-bind-address=:8081 - --metrics-bind-address=:8443 - --zap-log-level={{ .Values.operatorLogLevel }} + {{- with .Values.operator.extraArgs }} + {{- tpl (toYaml .) $ | nindent 8 }} + {{- end }} command: - /sail-operator + {{- with .Values.operator.env }} + env: + {{- toYaml . | nindent 8 }} + {{- end }} image: {{ .Values.image }} {{- if .Values.imagePullPolicy }} imagePullPolicy: {{ .Values.imagePullPolicy }} diff --git a/chart/values.yaml b/chart/values.yaml index 0c333a9d4..fdf50e6c8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -78,6 +78,7 @@ deployment: images.v1_28-alpha_8de61b9a.istiod: gcr.io/istio-testing/pilot:1.28-alpha.8de61b9a1cf9f20f1119f97da6ee939bfd919ffd images.v1_28-alpha_8de61b9a.proxy: gcr.io/istio-testing/proxyv2:1.28-alpha.8de61b9a1cf9f20f1119f97da6ee939bfd919ffd images.v1_28-alpha_8de61b9a.cni: gcr.io/istio-testing/install-cni:1.28-alpha.8de61b9a1cf9f20f1119f97da6ee939bfd919ffd +revisionHistoryLimit: 10 service: port: 8443 serviceAccountName: sail-operator @@ -147,6 +148,17 @@ image: quay.io/sail-dev/sail-operator:1.28-latest # We're commenting out the imagePullPolicy to use k8s defaults # imagePullPolicy: Always operator: + # env: + # - name: GOMAXPROCS + # valueFrom: + # resourceFieldRef: + # resource: limits.cpu + # divisor: '1' + # - name: GOMEMLIMIT + # valueFrom: + # resourceFieldRef: + # resource: limits.memory + # divisor: '1' resources: limits: cpu: 500m From ec85be1720e424ea6b8618fd25b2996ec03a7e62 Mon Sep 17 00:00:00 2001 From: t3mi Date: Tue, 23 Sep 2025 14:36:26 +0000 Subject: [PATCH 2/2] chore: update plain manifests Signed-off-by: t3mi --- bundle/manifests/sailoperator.clusterserviceversion.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle/manifests/sailoperator.clusterserviceversion.yaml b/bundle/manifests/sailoperator.clusterserviceversion.yaml index c0bde6a1d..0857c08e7 100644 --- a/bundle/manifests/sailoperator.clusterserviceversion.yaml +++ b/bundle/manifests/sailoperator.clusterserviceversion.yaml @@ -729,6 +729,7 @@ spec: name: sail-operator spec: replicas: 1 + revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/created-by: sailoperator