Updates for adding initContainer in VaultServerVersion (#268)

tapojit047 · web-flow · commit 6ea74978d698 · 2025-02-01T12:07:58.000+06:00
Signed-off-by: Tapajit Chandra Paul &lt;tapajit@appscode.com&gt;
diff --git a/apis/installer/v1alpha1/openapi_generated.go b/apis/installer/v1alpha1/openapi_generated.go
diff --git a/catalog/raw/vaultserver/vaultserver-0.11.5.yaml b/catalog/raw/vaultserver/vaultserver-0.11.5.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.10.3.yaml b/catalog/raw/vaultserver/vaultserver-1.10.3.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.11.5.yaml b/catalog/raw/vaultserver/vaultserver-1.11.5.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.12.1.yaml b/catalog/raw/vaultserver/vaultserver-1.12.1.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.13.3.yaml b/catalog/raw/vaultserver/vaultserver-1.13.3.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.0.yaml b/catalog/raw/vaultserver/vaultserver-1.2.0.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.2.yaml b/catalog/raw/vaultserver/vaultserver-1.2.2.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.3.yaml b/catalog/raw/vaultserver/vaultserver-1.2.3.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.5.9.yaml b/catalog/raw/vaultserver/vaultserver-1.5.9.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.6.5.yaml b/catalog/raw/vaultserver/vaultserver-1.6.5.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.7.2.yaml b/catalog/raw/vaultserver/vaultserver-1.7.2.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.7.3.yaml b/catalog/raw/vaultserver/vaultserver-1.7.3.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.8.2.yaml b/catalog/raw/vaultserver/vaultserver-1.8.2.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/catalog/raw/vaultserver/vaultserver-1.9.2.yaml b/catalog/raw/vaultserver/vaultserver-1.9.2.yaml
@@ -5,6 +5,8 @@ metadata:
 spec:
   exporter:
     image: ghcr.io/kubevault/vault-exporter:v0.1.1
+  initContainer:
+    image: busybox
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/crds/catalog.kubevault.com_vaultserverversions.yaml b/charts/kubevault-catalog/crds/catalog.kubevault.com_vaultserverversions.yaml
@@ -67,6 +67,19 @@ spec:
                 required:
                 - image
                 type: object
+              initContainer:
+                description: init container image
+                properties:
+                  image:
+                    description: Image is the Docker image name
+                    type: string
+                  imagePullPolicy:
+                    description: ImagePullPolicy one of Always, Never, IfNotPresent.
+                      It defaults to Always if :latest is used, or IfNotPresent otherwise.
+                    type: string
+                required:
+                - image
+                type: object
               stash:
                 description: Stash defines backup and restore task definitions.
                 properties:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-0.11.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-0.11.5.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.10.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.10.3.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.11.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.11.5.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.12.1.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.12.1.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.13.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.13.3.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.0.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.0.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.2.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.3.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.5.9.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.5.9.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.6.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.6.5.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.2.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.3.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.8.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.8.2.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.9.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.9.2.yaml
@@ -7,6 +7,8 @@ metadata:
 spec:
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-exporter") $) }}:v0.1.1'
+  initContainer:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "busybox") $) }}'
   stash:
     addon:
       backupTask:
diff --git a/charts/kubevault-crds/crds/catalog.kubevault.com_vaultserverversions.yaml b/charts/kubevault-crds/crds/catalog.kubevault.com_vaultserverversions.yaml
@@ -67,6 +67,19 @@ spec:
                 required:
                 - image
                 type: object
+              initContainer:
+                description: init container image
+                properties:
+                  image:
+                    description: Image is the Docker image name
+                    type: string
+                  imagePullPolicy:
+                    description: ImagePullPolicy one of Always, Never, IfNotPresent.
+                      It defaults to Always if :latest is used, or IfNotPresent otherwise.
+                    type: string
+                required:
+                - image
+                type: object
               stash:
                 description: Stash defines backup and restore task definitions.
                 properties:
diff --git a/crds/kubevault-catalog-crds.yaml b/crds/kubevault-catalog-crds.yaml
@@ -67,6 +67,19 @@ spec:
                 required:
                 - image
                 type: object
+              initContainer:
+                description: init container image
+                properties:
+                  image:
+                    description: Image is the Docker image name
+                    type: string
+                  imagePullPolicy:
+                    description: ImagePullPolicy one of Always, Never, IfNotPresent.
+                      It defaults to Always if :latest is used, or IfNotPresent otherwise.
+                    type: string
+                required:
+                - image
+                type: object
               stash:
                 description: Stash defines backup and restore task definitions.
                 properties:
diff --git a/crds/kubevault-crds.yaml b/crds/kubevault-crds.yaml
@@ -67,6 +67,19 @@ spec:
                 required:
                 - image
                 type: object
+              initContainer:
+                description: init container image
+                properties:
+                  image:
+                    description: Image is the Docker image name
+                    type: string
+                  imagePullPolicy:
+                    description: ImagePullPolicy one of Always, Never, IfNotPresent.
+                      It defaults to Always if :latest is used, or IfNotPresent otherwise.
+                    type: string
+                required:
+                - image
+                type: object
               stash:
                 description: Stash defines backup and restore task definitions.
                 properties:
diff --git a/go.mod b/go.mod
@@ -8,15 +8,14 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/gogo/protobuf v1.3.2
-	github.com/google/go-containerregistry v0.19.1 // indirect
 	github.com/google/gofuzz v1.2.0
 	github.com/spf13/pflag v1.0.5
 	github.com/yudai/gojsondiff v1.0.0
 	gomodules.xyz/go-sh v0.1.0
 	gomodules.xyz/semvers v0.0.0-20220316103017-cfbe8c37b63d
 	k8s.io/api v0.30.2
 	k8s.io/apimachinery v0.30.2
-	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2
 	kmodules.xyz/client-go v0.30.44
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/image-packer v0.0.0-20241207204410-7a879392f877
@@ -44,6 +43,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-containerregistry v0.19.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -79,7 +79,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/client-go v0.30.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
 	kubeops.dev/scanner v0.0.19 // indirect
 	sigs.k8s.io/controller-runtime v0.18.4 // indirect
diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
@@ -73,10 +73,6 @@ crd-importer \
     --input=https://github.com/kmodules/custom-resources/raw/v0.25.1/crds/metrics.appscode.com_metricsconfigurations.yaml \
     --out=./charts/kubevault-metrics/crds
 
-crd-importer \
-    --input=https://github.com/kubernetes-sigs/secrets-store-csi-driver/raw/v1.3.0/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml \
-    --out=./charts/secrets-store-reader/crds
-
 crd-importer \
     --input=https://github.com/kubeops/supervisor/raw/v0.0.2/crds/supervisor.appscode.com_recommendations.yaml \
     --out=./charts/kubevault-operator/crds
