Add lifecycle in nginx, portal, exporter, jobservice, registry, redis…

…, trivy Signed-off-by: derek <[email protected]>
goharbor · Apr 18, 2024 · d0cee30 · d0cee30
1 parent a04837f
commit d0cee30
Show file tree

Hide file tree

Showing 9 changed files with 381 additions and 333 deletions.
diff --git a/README.md b/README.md
diff --git a/templates/exporter/exporter-dpl.yaml b/templates/exporter/exporter-dpl.yaml
@@ -72,6 +72,10 @@ spec:
             port: {{ .Values.metrics.exporter.port }}
           initialDelaySeconds: 30
           periodSeconds: 10
+{{- with .Values.exporter.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
         args: ["-log-level", "{{ .Values.logLevel }}"]
         envFrom:
         - configMapRef:

diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
@@ -81,6 +81,10 @@ spec:
             port: {{ template "harbor.jobservice.containerPort" . }}
           initialDelaySeconds: 20
           periodSeconds: 10
+{{- with .Values.jobservice.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
 {{- if .Values.jobservice.resources }}
         resources:
 {{ toYaml .Values.jobservice.resources | indent 10 }}

diff --git a/templates/nginx/deployment.yaml b/templates/nginx/deployment.yaml
@@ -81,6 +81,10 @@ spec:
             port: {{ .port }}
           initialDelaySeconds: 1
           periodSeconds: 10
+{{- with .Values.nginx.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
 {{- if .Values.nginx.resources }}
         resources:
 {{ toYaml .Values.nginx.resources | indent 10 }}

diff --git a/templates/portal/deployment.yaml b/templates/portal/deployment.yaml
@@ -83,6 +83,10 @@ spec:
             port: {{ template "harbor.portal.containerPort" . }}
           initialDelaySeconds: 1
           periodSeconds: 10
+{{- with .Values.portal.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
         ports:
         - containerPort: {{ template "harbor.portal.containerPort" . }}
         volumeMounts:

diff --git a/templates/redis/statefulset.yaml b/templates/redis/statefulset.yaml
@@ -58,6 +58,10 @@ spec:
             port: 6379
           initialDelaySeconds: 1
           periodSeconds: 10
+{{- with .Values.redis.internal.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
 {{- if .Values.redis.internal.resources }}
         resources:
 {{ toYaml .Values.redis.internal.resources | indent 10 }}

diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
@@ -84,6 +84,10 @@ spec:
             port: {{ template "harbor.registry.containerPort" . }}
           initialDelaySeconds: 1
           periodSeconds: 10
+{{- with .Values.registry.registry.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
 {{- if .Values.registry.registry.resources }}
         resources:
 {{ toYaml .Values.registry.registry.resources | indent 10 }}
@@ -223,6 +227,10 @@ spec:
             port: {{ template "harbor.registryctl.containerPort" . }}
           initialDelaySeconds: 1
           periodSeconds: 10
+{{- with .Values.registry.controller.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
 {{- if .Values.registry.controller.resources }}
         resources:
 {{ toYaml .Values.registry.controller.resources | indent 10 }}

diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
@@ -164,6 +164,10 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             failureThreshold: 3
+{{- with .Values.trivy.lifecycle }}
+          lifecycle:
+{{ toYaml . | indent 10 }}
+{{- end }}
           resources:
 {{ toYaml .Values.trivy.resources | indent 12 }}
       {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }}

diff --git a/values.yaml b/values.yaml
@@ -497,6 +497,7 @@ nginx:
   extraEnvVars: []
   nodeSelector: {}
   tolerations: []
+  lifecycle: {}
   affinity: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints: []
@@ -528,6 +529,7 @@ portal:
   extraEnvVars: []
   nodeSelector: {}
   tolerations: []
+  lifecycle: {}
   affinity: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints: []
@@ -642,6 +644,7 @@ jobservice:
   extraEnvVars: []
   nodeSelector: {}
   tolerations: []
+  lifecycle : {}
   affinity: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints:
@@ -689,6 +692,7 @@ registry:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
+    lifecycle: {}
     extraEnvVars: []
   controller:
     image:
@@ -698,6 +702,7 @@ registry:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
+    lifecycle: {}
     extraEnvVars: []
   # set the service account to be used, default if left empty
   serviceAccountName: ""
@@ -707,6 +712,7 @@ registry:
   revisionHistoryLimit: 10
   nodeSelector: {}
   tolerations: []
+  lifecycle: {}
   affinity: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints: []
@@ -785,6 +791,7 @@ trivy:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  lifecycle: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints: []
   # - maxSkew: 1
@@ -938,6 +945,7 @@ redis:
     extraEnvVars: []
     nodeSelector: {}
     tolerations: []
+    lifecycle: {}
     affinity: {}
     ## The priority class to run the pod as
     priorityClassName:
@@ -997,6 +1005,7 @@ exporter:
   podLabels: {}
   nodeSelector: {}
   tolerations: []
+  lifecycle: {}
   affinity: {}
   # Spread Pods across failure-domains like regions, availability zones or nodes
   topologySpreadConstraints: []