[artifactory-ha] Add Annotations to Primary Artifactory Service and R…

…esources to Nginx Deployment (#1862)
jfrog · Oct 30, 2024 · f43e0fe · f43e0fe
1 parent 5134ac5
commit f43e0fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/stable/artifactory-ha/templates/artifactory-primary-service.yaml b/stable/artifactory-ha/templates/artifactory-primary-service.yaml
@@ -14,6 +14,10 @@ metadata:
     {{- with .Values.artifactory.primary.labels }}
 {{ toYaml . | indent 4 }}
     {{- end }}
+{{- with .Values.artifactory.primary.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   # Statically setting service type to ClusterIP since this is an internal only service
   type: ClusterIP

diff --git a/stable/artifactory-ha/templates/nginx-deployment.yaml b/stable/artifactory-ha/templates/nginx-deployment.yaml
@@ -81,6 +81,8 @@ spec:
         volumeMounts:
         - mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
           name: nginx-volume
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
       containers:
       - name: {{ .Values.nginx.name }}
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "nginx") }}

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -940,6 +940,7 @@ artifactory:
     ## preStartCommand specific to the primary node, to be run after artifactory.preStartCommand
     # preStartCommand:
     labels: {}
+    annotations: {}
     persistence:
       ## Set existingClaim to true or false
       ## If true, you must prepare a PVC with the name e.g `volume-myrelease-artifactory-ha-primary-0`