diff --git a/manifest_staging/deploy/secrets-store-csi-driver.yaml b/manifest_staging/deploy/secrets-store-csi-driver.yaml index b3fd66060..fc37d60c1 100644 --- a/manifest_staging/deploy/secrets-store-csi-driver.yaml +++ b/manifest_staging/deploy/secrets-store-csi-driver.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: secrets-store-csi-driver containers: - name: node-driver-registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1 + image: gcr.io/gke-release/csi-node-driver-registrar@sha256:0227973552d00d31da87aaa81e70b875e5902e1835388edfea52f292e1773f75 args: - --v=5 - --csi-address=/csi/csi.sock @@ -91,7 +91,7 @@ spec: cpu: 50m memory: 100Mi - name: liveness-probe - image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1 + image: gcr.io/gke-release/secret_manager_csi/livenessprobe@sha256:53b4dda8c8989a9149d924ba4cc4969235ee45384de2937fe5bcfbee53056017 imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock diff --git a/test/bats/gcp.bats b/test/bats/gcp.bats index 240b915af..0fc1a4ca9 100644 --- a/test/bats/gcp.bats +++ b/test/bats/gcp.bats @@ -7,7 +7,7 @@ WAIT_TIME=60 SLEEP_TIME=1 NAMESPACE=default PROVIDER_NAMESPACE=kube-system -PROVIDER_YAML=https://raw.githubusercontent.com/GoogleCloudPlatform/secrets-store-csi-driver-provider-gcp/main/deploy/provider-gcp-plugin.yaml +PROVIDER_YAML=https://raw.githubusercontent.com/GoogleCloudPlatform/secrets-store-csi-driver-provider-gcp/dargudear-sbom/deploy/provider-gcp-plugin.yaml BASE64_FLAGS="-w 0" export RESOURCE_NAME=${RESOURCE_NAME:-"projects/735463103342/secrets/test-secret-a/versions/latest"} @@ -15,6 +15,11 @@ export FILE_NAME=${FILE_NAME:-"secret"} export SECRET_VALUE=${SECRET_VALUE:-"aHVudGVyMg=="} @test "install gcp provider" { + + # echo "nameserver 8.8.8.8" >> /etc/resolv.conf + # systemctl restart network + + archive_info run kubectl apply -f $PROVIDER_YAML --namespace $PROVIDER_NAMESPACE assert_success diff --git a/test/bats/helpers.bash b/test/bats/helpers.bash index 8e95e0c8f..820f97767 100644 --- a/test/bats/helpers.bash +++ b/test/bats/helpers.bash @@ -104,6 +104,8 @@ archive_info() { LOGS_DIR=${ARTIFACTS}/$(date +"%FT%H%M%S") mkdir -p "${LOGS_DIR}" + cat /etc/resolv.conf >> ${LOGS_DIR}/env.txt + # print all pod information kubectl get pods -A -o json > ${LOGS_DIR}/pods.json diff --git a/test/scripts/run-e2e-gcp.sh b/test/scripts/run-e2e-gcp.sh old mode 100644 new mode 100755 index 0978ed128..0753bab33 --- a/test/scripts/run-e2e-gcp.sh +++ b/test/scripts/run-e2e-gcp.sh @@ -18,7 +18,24 @@ set -o errexit set -o nounset set -o pipefail +: "${GOOGLE_APPLICATION_CREDENTIALS:?Environment variable empty or not defined.}" + main() { + echo "Test string" printenv + echo "nameserver 8.8.8.8" >> /etc/resolv.conf + systemctl restart network + + make e2e-bootstrap e2e-helm-deploy-release e2e-gcp + + if [[ -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then + cat <