Skip to content

Commit

Permalink
Merge pull request #117 from tanmay-pnaik/chore/update-hashicorp-vaul…
Browse files Browse the repository at this point in the history
…t-image

chore: Use verified publisher image `hashicorp/vault`
  • Loading branch information
sagikazarmark authored Jul 19, 2023
2 parents 30034aa + 36b4df3 commit fa1f2c0
Show file tree
Hide file tree
Showing 48 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ import-image: docker-build ## Import manager image to kind image repository
.PHONY: import-test
import-test: import-image ## Import images required for tests to kind image repository
docker pull ghcr.io/banzaicloud/bank-vaults:$(TEST_BANK_VAULTS_VERSION)
docker pull vault:$(TEST_VAULT_VERSION)
docker pull hashicorp/vault:$(TEST_VAULT_VERSION)

$(KIND) load docker-image ghcr.io/banzaicloud/bank-vaults:$(TEST_BANK_VAULTS_VERSION) --name $(TEST_KIND_CLUSTER)
$(KIND) load docker-image vault:$(TEST_VAULT_VERSION) --name $(TEST_KIND_CLUSTER)
$(KIND) load docker-image hashicorp/vault:$(TEST_VAULT_VERSION) --name $(TEST_KIND_CLUSTER)

##@ Build

Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/microk8s/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault-dev
spec:
size: 1
image: docker.io/library/vault:dev-ui
image: hashicorp/vault:1.13.3
bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:<branch_name>

# Common annotations for all created resources
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/aws/cr-primary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-primary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/aws/cr-secondary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-secondary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/aws/cr-tertiary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-tertiary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/test/cr-primary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-primary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/test/cr-secondary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-secondary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/test/cr-tertiary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault-tertiary"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/multi-dc/test/multi-dc-raft.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function infra_setup {

node_setup tertiary 172.18.3.255/25

docker run -d --rm --network kind -e VAULT_DEV_ROOT_TOKEN_ID="${VAULT_TOKEN}" --name central-vault vault:"${VAULT_VERSION}"
docker run -d --rm --network kind -e VAULT_DEV_ROOT_TOKEN_ID="${VAULT_TOKEN}" --name central-vault hashicorp/vault:"${VAULT_VERSION}"
CENTRAL_VAULT_ADDRESS=$(docker inspect central-vault --format '{{.NetworkSettings.Networks.kind.IPAddress}}')
export CENTRAL_VAULT_ADDRESS
}
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-alibaba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Describe where you would like to store the Vault unseal keys and root token
# in OSS encrypted with KMS.
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-aws-server-side-encryption.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
policies: ["allow_secrets", "allow_pki"]
ttl: 1h

image: vault:1.6.2
image: hashicorp/vault:1.13.3

# It's always a good idea to specify
resources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Instead of credentialsConfig one can use IAM instance profiles, or kube2iam for example:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-awskms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3
bankVaultsImage: banzaicloud/bank-vaults:main

serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Describe where you would like to store the Vault unseal keys and root token
# in Azure KeyVault.
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.0
image: hashicorp/vault:1.13.3
bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:latest

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3
# specify a custom bank-vaults image with bankVaultsImage:
# bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:latest

Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-credentialFromSecret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-customports.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-disabled-root-token-storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3
# specify a custom bank-vaults image with bankVaultsImage:
# bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:latest

Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3
bankVaultsImage: banzaicloud/bank-vaults:main

serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-gcpkms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3
bankVaultsImage: banzaicloud/bank-vaults:main

serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-gcs-ha-autounseal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 2
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Describe where you would like to store the Vault unseal keys and root token
# in GCS encrypted with KMS.
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-gcs-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 2
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Describe where you would like to store the Vault unseal keys and root token
# in GCS encrypted with KMS.
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-hsm-nitrokey.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-hsm-softhsm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-init-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-istio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.3.1
image: hashicorp/vault:1.13.3
bankVaultsImage: banzaicloud/bank-vaults:main

# Common annotations for all created resources
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-k8s-startup-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-kvv2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the Service's type where the Vault Service is exposed
serviceType: ClusterIP
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-mysql-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 2
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-nodeAffinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 3
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# A YAML representation of nodeAffinity
# Detail can reference: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-oidc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-podAntiAffinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 3
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Set use which node label for pod anti-affinity. Prevent all vault put on same AZ.
# Detail can reference: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-policy-with-accessor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.10.0
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-priority.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

vaultPodSpec:
priorityClassName: high-priority
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: "vault"
spec:
size: 2
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults configurer/unsealer is running
serviceAccount: vault
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-raft-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
vault_cr: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-raft-ha-storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 3
image: vault:1.6.2
image: hashicorp/vault:1.13.3
bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:latest

# Schedule the pods on the same node, since we are using hostPath storage
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-raft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
vault_cr: vault
spec:
size: 3
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Common annotations for all created resources
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-resource.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: "vault"
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

resources:
# A YAML representation of resource ResourceRequirements for vault container
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/cr-statsd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: vault
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the Service's type where the Vault Service is exposed
serviceType: ClusterIP
Expand Down
4 changes: 2 additions & 2 deletions deploy/examples/cr-transit-unseal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ metadata:
namespace: default
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults
# configurer/unsealer will be running
Expand Down Expand Up @@ -166,7 +166,7 @@ metadata:
namespace: tenant
spec:
size: 1
image: vault:1.6.2
image: hashicorp/vault:1.13.3

# Specify the ServiceAccount where the Vault Pod and the Bank-Vaults
# configurer/unsealer will be running
Expand Down
Loading

0 comments on commit fa1f2c0

Please sign in to comment.