Merge pull request bank-vaults#65 from becker-s/main

chore: use hashicorp/vault image as _/vault is deprecated
JonTheNiceGuy · Jul 18, 2023 · 2b42e2f · 2b42e2f
2 parents 3495c24 + f38e47e
commit 2b42e2f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -51,7 +51,7 @@ jobs:
 
     services:
       vault:
-        image: vault:${{ matrix.vault_version }}
+        image: hashicorp/vault:${{ matrix.vault_version }}
         env:
           SKIP_SETCAP: true
           VAULT_DEV_ROOT_TOKEN_ID: 227e1cce-6bf7-30bb-2d2a-acc854318caf

diff --git a/deploy/charts/vault-secrets-webhook/README.md b/deploy/charts/vault-secrets-webhook/README.md
@@ -117,7 +117,7 @@ The following tables lists configurable parameters of the vault-secrets-webhook
 | topologySpreadConstraints          | topologySpreadConstraints to add                                              | `{}`                                                     |
 | rbac.psp.enabled                   | use pod security policy                                                       | `false`                                                  |
 | rbac.authDelegatorRole.enabled     | bind `system:auth-delegator` to the ServiceAccount                            | `false`                                                  |
-| env.VAULT_IMAGE                    | vault image                                                                   | `vault:1.6.2`                                            |
+| env.VAULT_IMAGE                    | vault image                                                                   | `hashicorp/vault:1.13.3`                                 |
 | env.VAULT_ENV_CPU_REQUEST          | cpu requests for init-containers vault-env and copy-vault-env                 | `50m`                                                    |
 | env.VAULT_ENV_MEMORY_REQUEST       | memory requests for init-containers vault-env and copy-vault-env              | `64Mi`                                                   |
 | env.VAULT_ENV_CPU_LIMIT            | cpu limits for init-containers vault-env and copy-vault-env                   | `250m`                                                   |

diff --git a/deploy/charts/vault-secrets-webhook/values.yaml b/deploy/charts/vault-secrets-webhook/values.yaml
@@ -52,7 +52,7 @@ vaultEnv:
   tag: "v1.21.0"
 
 env:
-  VAULT_IMAGE: vault:1.13.3
+  VAULT_IMAGE: hashicorp/vault:1.13.3
   # VAULT_CAPATH: /vault/tls
   # # Used when the pod that should get secret injected does not
   # # specify an imagePullSecret

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   vault:
-    image: vault:1.13.3
+    image: hashicorp/vault:1.13.3
     ports:
       - 127.0.0.1:8200:8200
     environment:

diff --git a/e2e/deploy/vault-secrets-webhook/values.yaml b/e2e/deploy/vault-secrets-webhook/values.yaml
@@ -9,4 +9,4 @@ podsFailurePolicy: "Fail"
 secretsFailurePolicy: "Fail"
 
 env:
-  VAULT_IMAGE: vault:1.13.3
+  VAULT_IMAGE: hashicorp/vault:1.13.3
diff --git a/e2e/deploy/vault/vault.yaml b/e2e/deploy/vault/vault.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "vault"
 spec:
   size: 1
-  image: vault:1.13.3
+  image: hashicorp/vault:1.13.3
 
   # Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
   serviceAccount: vault

diff --git a/pkg/webhook/config.go b/pkg/webhook/config.go
@@ -443,7 +443,7 @@ func getPullPolicy(pullPolicyStr string) corev1.PullPolicy {
 }
 
 func SetConfigDefaults() {
-	viper.SetDefault("vault_image", "vault:latest")
+	viper.SetDefault("vault_image", "hashicorp/vault:latest")
 	viper.SetDefault("vault_image_pull_policy", string(corev1.PullIfNotPresent))
 	viper.SetDefault("vault_env_image", "ghcr.io/bank-vaults/vault-env:latest")
 	viper.SetDefault("vault_env_pull_policy", string(corev1.PullIfNotPresent))