fix: fix gcp ingress

aws/k8s/secret-challenge-vault-deployment.yml

@@ -41,7 +41,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-aws-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC6-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0RC9-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:

gcp/k8s-vault-gcp-ingress-start.sh

@@ -11,6 +11,12 @@ echo "This is a script to bootstrap the configuration. You need to have installe
 echo "This script is based on the steps defined in https://learn.hashicorp.com/tutorials/vault/kubernetes-minikube. Vault is awesome!"
 
 export GCP_PROJECT=$(gcloud config list --format 'value(core.project)' 2>/dev/null)
+#export USE_GKE_GCLOUD_AUTH_PLUGIN=True
+
+export REGION="$(terraform output -raw region)"
+export CLUSTER_NAME="$(terraform output -raw kubernetes_cluster_name)"
+
+gcloud container clusters get-credentials --project ${GCP_PROJECT} --zone ${REGION} ${CLUSTER_NAME}
 
 kubectl get configmaps | grep 'secrets-file' &>/dev/null
 if [ $? == 0 ]; then
@@ -24,24 +30,25 @@ if [ $? == 0 ]; then
   echo "secrets secret is already installed"
 else
   kubectl apply -f ../k8s/secrets-secret.yml
+  kubectl apply -f ../k8s/challenge33.yml
 fi
 
 helm list | grep 'consul' &>/dev/null
 if [ $? == 0 ]; then
   echo "Consul is already installed"
 else
   helm repo add hashicorp https://helm.releases.hashicorp.com
-  helm install consul hashicorp/consul --version 0.30.0 --values ../k8s/helm-consul-values.yml
+  helm install consul hashicorp/consul --values ../k8s/helm-consul-values.yml
 fi
 
-while [[ $(kubectl get pods -l app=consul -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True True True True" ]]; do echo "waiting for Consul" && sleep 2; done
+while [[ $(kubectl get pods -l app=consul -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True True True True True True" ]]; do echo "waiting for Consul" && sleep 2; done
 
 helm list | grep 'vault' &>/dev/null
 if [ $? == 0 ]; then
   echo "Vault is already installed"
 else
   helm repo add hashicorp https://helm.releases.hashicorp.com
-  helm install vault hashicorp/vault --version 0.9.1 --values ../k8s/helm-vault-values.yml
+  helm install vault hashicorp/vault --values ../k8s/helm-vault-values.yml
 fi
 
 isvaultrunning=$(kubectl get pods --field-selector=status.phase=Running)

gcp/k8s/secret-challenge-vault-deployment.yml.tpl

@@ -39,7 +39,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-gcp-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC4B-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0RC9-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           ports:

k8s/secret-challenge-vault-deployment.yml

@@ -30,7 +30,7 @@ spec:
         runAsNonRoot: true
       serviceAccountName: vault
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC4B-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0RC9-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:
@@ -47,32 +47,32 @@ spec:
               protocol: TCP
           readinessProbe:
             httpGet:
-              path: '/actuator/health/readiness'
+              path: "/actuator/health/readiness"
               port: 8080
             initialDelaySeconds: 30
             timeoutSeconds: 5
             periodSeconds: 5
             failureThreshold: 8
           livenessProbe:
             httpGet:
-              path: '/actuator/health/liveness'
+              path: "/actuator/health/liveness"
               port: 8080
             initialDelaySeconds: 35
             timeoutSeconds: 30
             periodSeconds: 40
             failureThreshold: 5
           resources:
             requests:
-              memory: '512Mi'
-              cpu: '200m'
-              ephemeral-storage: '1Gi'
+              memory: "512Mi"
+              cpu: "200m"
+              ephemeral-storage: "1Gi"
             limits:
-              memory: '512Mi'
-              cpu: '1200m'
-              ephemeral-storage: '2Gi'
+              memory: "512Mi"
+              cpu: "1200m"
+              ephemeral-storage: "2Gi"
           volumeMounts:
-            - name: 'ephemeral'
-              mountPath: '/tmp'
+            - name: "ephemeral"
+              mountPath: "/tmp"
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           env:
@@ -98,8 +98,8 @@ spec:
             - name: JWT_PATH
               value: "/var/run/secrets/kubernetes.io/serviceaccount/token"
       volumes:
-        - name: 'ephemeral'
-          emptyDir: { }
+        - name: "ephemeral"
+          emptyDir: {}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler