feat: init containers for database, redis

goharbor · Jun 18, 2024 · dbb0dd3 · dbb0dd3
1 parent 7866537
commit dbb0dd3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -329,6 +329,7 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `database.internal.priorityClassName`                                 | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                             |                                       |
 | `database.internal.livenessProbe.timeoutSeconds`                      | The timeout used in liveness probe; 1 to 5 seconds                                                                                                                                                                                                                                                                                                                                                                                                               | 1                                     |
 | `database.internal.readinessProbe.timeoutSeconds`                     | The timeout used in readiness probe; 1 to 5 seconds                                                                                                                                                                                                                                                                                                                                                                                                              | 1                                     |
+| `database.internal.extrInitContainers`                                | Extra init containers to be run before the database's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                              |  `[]`                               |
 | `database.external.host`                                              | The hostname of external database                                                                                                                                                                                                                                                                                                                                                                                                                                | `192.168.0.1`                         |
 | `database.external.port`                                              | The port of external database                                                                                                                                                                                                                                                                                                                                                                                                                                    | `5432`                                |
 | `database.external.username`                                          | The username of external database                                                                                                                                                                                                                                                                                                                                                                                                                                | `user`                                |
@@ -354,6 +355,7 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `redis.internal.trivyAdapterIndex`                                    | The database index for trivy adapter                                                                                                                                                                                                                                                                                                                                                                                                                             | `5`                                   |
 | `redis.internal.harborDatabaseIndex`                                  | The database index for harbor miscellaneous business logic                                                                                                                                                                                                                                                                                                                                                                                                                                | `0`                                   |
 | `redis.internal.cacheLayerDatabaseIndex`                              | The database index for harbor cache layer                                                                                                                                                                                                                                                                                                                                                                                                                                | `0`                                   |
+| `redis.internal.initContainers`                                       | Init containers to be run before the redis's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                              |  `[]`                               |
 | `redis.external.addr`                                                 | The addr of external Redis: <host_redis>:<port_redis>. When using sentinel, it should be <host_sentinel1>:<port_sentinel1>,<host_sentinel2>:<port_sentinel2>,<host_sentinel3>:<port_sentinel3>                                                                                                                                                                                                                                                                   | `192.168.0.2:6379`                    |
 | `redis.external.sentinelMasterSet`                                    | The name of the set of Redis instances to monitor                                                                                                                                                                                                                                                                                                                                                                                                                |                                       |
 | `redis.external.coreDatabaseIndex`                                    | The database index for core                                                                                                                                                                                                                                                                                                                                                                                                                                      | `0`                                   |

diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
@@ -63,6 +63,9 @@ spec:
           - name: database-data
             mountPath: /var/lib/postgresql/data
             subPath: {{ $database.subPath }}
+      {{- with .Values.database.internal.extrInitContainers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       containers:
       - name: database
         image: {{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag }}

diff --git a/templates/redis/statefulset.yaml b/templates/redis/statefulset.yaml
@@ -41,6 +41,10 @@ spec:
       {{- end }}
       automountServiceAccountToken: {{ .Values.redis.internal.automountServiceAccountToken | default false }}
       terminationGracePeriodSeconds: 120
+      {{- with .Values.redis.internal.initContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: redis
         image: {{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag }}

diff --git a/values.yaml b/values.yaml
@@ -908,6 +908,13 @@ database:
     affinity: {}
     ## The priority class to run the pod as
     priorityClassName:
+    # containers to be run before the controller's container starts.
+    extrInitContainers: []
+    # Example:
+    #
+    # - name: wait
+    #   image: busybox
+    #   command: [ 'sh', '-c', "sleep 20" ]
     # The initial superuser password for internal database
     password: "changeit"
     # The size limit for Shared memory, pgSQL use it for shared_buffer
@@ -975,6 +982,13 @@ redis:
     affinity: {}
     ## The priority class to run the pod as
     priorityClassName:
+    # containers to be run before the controller's container starts.
+    initContainers: []
+    # Example:
+    #
+    # - name: wait
+    #   image: busybox
+    #   command: [ 'sh', '-c', "sleep 20" ]
     # # jobserviceDatabaseIndex defaults to "1"
     # # registryDatabaseIndex defaults to "2"
     # # trivyAdapterIndex defaults to "5"