diff --git a/.github/workflows/test-helm.yml b/.github/workflows/test-helm.yml index 837798ee..3c603a22 100644 --- a/.github/workflows/test-helm.yml +++ b/.github/workflows/test-helm.yml @@ -43,7 +43,6 @@ jobs: service_account: 'github@computer-vision-team.iam.gserviceaccount.com' # token_format: access_token workload_identity_provider: ${{ secrets.ORG_GOOGLE_WORKLOAD_IDP }} - # export_environment_variables: true - name: Set up gcloud uses: google-github-actions/setup-gcloud@v2.1.0 # - name: Login to GAR @@ -55,6 +54,7 @@ jobs: - name: Run Helm integration tests for internal shell: bash run: | + cat "${GOOGLE_APPLICATION_CREDENTIALS}" make start make test-integration-helm-internal # integration-helm-legacy: diff --git a/Makefile b/Makefile index baca2368..a6c4f983 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ pre-commit: ## Run pre-commit against all files start: ## Run minikube with ingress and gcp-auth minikube start --wait=all - minikube addons enable gcp-auth --alsologtostderr -v=5 + minikube addons enable gcp-auth --alsologtostderr -v=5 --refresh minikube addons enable ingress stop: ## Stop minikube diff --git a/tests/integration/helm/helm-internal-auth_test.go b/tests/integration/helm/helm-internal-auth_test.go index ec804fc4..565ef62d 100644 --- a/tests/integration/helm/helm-internal-auth_test.go +++ b/tests/integration/helm/helm-internal-auth_test.go @@ -257,8 +257,9 @@ func (s *internalAuthHelmTest) TestHelmInstall() { if errDeployment != nil { // Get details why it failed - // Get k8s logs from gcp-auth kubectlOptionsGcpAuth := k8s.NewKubectlOptions(s.context, "", "gcp-auth") + + // Get k8s logs from gcp-auth podsGcpAuth := k8s.ListPods(subT, kubectlOptionsGcpAuth, metav1.ListOptions{LabelSelector: "app=gcp-auth"}) logger.Log(subT, "Logs - GCP Auth:") for _, pod := range podsGcpAuth { @@ -274,6 +275,11 @@ func (s *internalAuthHelmTest) TestHelmInstall() { logger.Log(subT, fmt.Sprintf("%s\t%s\t%s\t%s", event.Type, event.Reason, event.Related, event.Message)) } + // Get k8s secret + logger.Log(subT, "Secret in ephemeral namespace:") + secret := k8s.GetSecret(subT, kubectlOptions, "gcp-auth") + logger.Log(subT, fmt.Sprintf("%s\t%s", secret.Type, secret.ObjectMeta.CreationTimestamp)) + // TODO: DRY // Get k8s logs from pod selectorLabelsPods := makeLabels(deployment.Spec.Selector.MatchLabels)