diff --git a/chart/Chart.yaml b/chart/Chart.yaml index f17d3dc..90ae0fb 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -10,9 +10,9 @@ description: | type: application -version: 0.5.50 +version: 0.5.51 -appVersion: "0.5.50" +appVersion: "0.5.51" home: https://github.com/lukaszraczylo/kubernetes-images-sync-operator diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 023be5f..633ee6e 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -4,27 +4,23 @@ metadata: name: {{ include "chart.fullname" . }}-sa labels: control-plane: sa - {{- include "chart.labels" . | nindent 4 }} + {{- include "chart.labels" . | nindent 4 }} spec: replicas: {{ .Values.sa.replicas }} selector: matchLabels: control-plane: sa - {{- include "chart.selectorLabels" . | nindent 6 }} + {{- include "chart.selectorLabels" . | nindent 6 }} template: metadata: labels: control-plane: sa - {{- include "chart.selectorLabels" . | nindent 8 }} + {{- include "chart.selectorLabels" . | nindent 8 }} annotations: kubectl.kubernetes.io/default-container: manager spec: containers: - - name: manager - args: - {{- range .Values.sa.manager.args }} - - {{ . }} - {{- end }} + - args: {{- toYaml .Values.sa.manager.args | nindent 8 }} command: - /manager env: @@ -34,26 +30,24 @@ spec: fieldPath: spec.serviceAccountName - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} - - name: WORKER_IMAGE - value: {{ printf "%s:%s" .Values.worker.image.repository (.Values.worker.image.tag | default .Chart.AppVersion) }} - image: {{ printf "%s:%s" .Values.sa.manager.image.repository (.Values.sa.manager.image.tag | default .Chart.AppVersion) }} + image: {{ .Values.sa.manager.image.repository }}:{{ .Values.sa.manager.image.tag + | default .Chart.AppVersion }} livenessProbe: httpGet: path: /healthz port: 8081 initialDelaySeconds: 15 periodSeconds: 20 + name: manager readinessProbe: httpGet: path: /readyz port: 8081 initialDelaySeconds: 5 periodSeconds: 10 - resources: - {{- toYaml .Values.sa.manager.resources | nindent 10 }} - securityContext: - {{- toYaml .Values.sa.manager.containerSecurityContext | nindent 10 }} - securityContext: - {{- toYaml .Values.sa.podSecurityContext | nindent 8 }} + resources: {{- toYaml .Values.sa.manager.resources | nindent 10 }} + securityContext: {{- toYaml .Values.sa.manager.containerSecurityContext | nindent + 10 }} + securityContext: {{- toYaml .Values.sa.podSecurityContext | nindent 8 }} serviceAccountName: {{ include "chart.fullname" . }}-sa - terminationGracePeriodSeconds: 10 + terminationGracePeriodSeconds: 10 \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 78f2982..a37d2b9 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,22 +1,18 @@ kubernetesClusterDomain: cluster.local -worker: - image: - repository: ghcr.io/lukaszraczylo/kubernetes-images-sync-worker - tag: null # Will default to .Chart.AppVersion if not set sa: manager: args: - - --metrics-bind-address=:8443 - - --leader-elect - - --health-probe-bind-address=:8081 + - --metrics-bind-address=:8443 + - --leader-elect + - --health-probe-bind-address=:8081 containerSecurityContext: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL image: repository: ghcr.io/lukaszraczylo/kubernetes-images-sync-operator - tag: 0.5.50 + tag: 0.5.51 resources: limits: cpu: 500m @@ -31,8 +27,8 @@ sa: annotations: {} saMetricsService: ports: - - name: https - port: 8443 - protocol: TCP - targetPort: 8443 + - name: https + port: 8443 + protocol: TCP + targetPort: 8443 type: ClusterIP diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 856eefa..ccca564 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -68,6 +68,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName + - name: WORKER_IMAGE + value: ghcr.io/lukaszraczylo/kubernetes-images-sync-worker:latest image: controller:latest name: manager securityContext: