resolve conflicts

deployments/kubernetes/chart/reloader/Chart.yaml

@@ -3,8 +3,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: 1.0.119
-appVersion: v1.0.119
+version: 1.0.121
+appVersion: v1.0.121
 keywords:
   - Reloader
   - kubernetes

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -76,8 +76,23 @@ spec:
       - image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}"
         imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }}
         name: {{ template "reloader-fullname" . }}
-      {{- if or (.Values.reloader.deployment.env.open) (.Values.reloader.deployment.env.secret) (.Values.reloader.deployment.env.field) (.Values.reloader.deployment.env.existing) (eq .Values.reloader.watchGlobally false) (.Values.reloader.enableHA) (.Values.reloader.enableMetricsByNamespace)}}
         env:
+        - name: GOMAXPROCS
+        {{- if .Values.reloader.deployment.gomaxprocsOverride }}
+          value: {{ .Values.reloader.deployment.gomaxprocsOverride | quote }}
+        {{- else }}
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        {{- end }}
+        - name: GOMEMLIMIT
+        {{- if .Values.reloader.deployment.gomemlimitOverride }}
+          value: {{ .Values.reloader.deployment.gomemlimitOverride | quote }}
+        {{- else }}
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
+        {{- end }}
       {{- range $name, $value := .Values.reloader.deployment.env.open }}
       {{- if not (empty $value) }}
         - name: {{ $name | quote }}
@@ -133,8 +148,6 @@ spec:
         - name: METRICS_COUNT_BY_NAMESPACE
           value: enabled
       {{- end }}
-      {{- end }}
-
         ports:
         - name: http
           containerPort: 9090

deployments/kubernetes/chart/reloader/tests/deployment_test.yaml

@@ -48,3 +48,16 @@ tests:
     asserts:
       - isEmpty:
           path: spec.template.spec.containers[0].securityContext
+
+  - it: template still sets POD_NAME and POD_NAMESPACE environment variables when enableHA is true
+    set:
+      reloader:
+        enableHA: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name

deployments/kubernetes/chart/reloader/values.yaml

@@ -92,10 +92,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v1.0.119
+      version: v1.0.121
     image:
       name: ghcr.io/stakater/reloader
-      tag: v1.0.119
+      tag: v1.0.121
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:
@@ -147,6 +147,11 @@ reloader:
     # imagePullSecrets:
     #   - name: myregistrykey
 
+    # Put "0" in either to have go runtime ignore the set value.
+    # Otherwise, see https://pkg.go.dev/runtime#hdr-Environment_Variables for GOMAXPROCS and GOMEMLIMIT
+    gomaxprocsOverride: ""
+    gomemlimitOverride: ""
+
   service: {}
     # labels: {}
     # annotations: {}

deployments/kubernetes/manifests/deployment.yaml

@@ -20,6 +20,15 @@ spec:
         - image: "ghcr.io/stakater/reloader:latest"
           imagePullPolicy: IfNotPresent
           name: reloader-reloader
+          env:
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.cpu
+            - name: GOMEMLIMIT
+              valueFrom:
+                resourceFieldRef:
+                  resource: limits.memory
           ports:
             - name: http
               containerPort: 9090

deployments/kubernetes/reloader.yaml

@@ -8,7 +8,7 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.119"
+    chart: "reloader-1.0.121"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -25,7 +25,7 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.119"
+    chart: "reloader-1.0.121"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -92,7 +92,7 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.119"
+    chart: "reloader-1.0.121"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -115,7 +115,7 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.119"
+    chart: "reloader-1.0.121"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -135,7 +135,7 @@ spec:
     metadata:
       labels:
         app: reloader-reloader
-        chart: "reloader-1.0.119"
+        chart: "reloader-1.0.121"
         release: "reloader"
         heritage: "Helm"
         app.kubernetes.io/managed-by: "Helm"
@@ -147,7 +147,15 @@ spec:
       - image: "ghcr.io/stakater/reloader:latest"
         imagePullPolicy: IfNotPresent
         name: reloader-reloader
-
+        env:
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.cpu
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
         ports:
         - name: http
           containerPort: 9090
@@ -174,8 +182,8 @@ spec:
           {}
         resources:
           limits:
-            cpu: 150m
-            memory: 512Mi
+            cpu: "1"
+            memory: 128Mi
           requests:
             cpu: 10m
             memory: 128Mi