diff --git a/.github/workflows/dapr-pubsub.yaml b/.github/workflows/dapr-pubsub.yaml index 2700fe26ac8..11be992f93d 100644 --- a/.github/workflows/dapr-pubsub.yaml +++ b/.github/workflows/dapr-pubsub.yaml @@ -45,7 +45,7 @@ jobs: kind load docker-image --name kind gatekeeper-e2e:latest gatekeeper-crds:latest kubectl create ns gatekeeper-system make e2e-publisher-deploy - make e2e-helm-deploy HELM_REPO=gatekeeper-e2e HELM_CRD_REPO=gatekeeper-crds HELM_RELEASE=latest ENABLE_PUBSUB=true + make e2e-helm-deploy HELM_REPO=gatekeeper-e2e HELM_CRD_REPO=gatekeeper-crds HELM_RELEASE=latest ENABLE_PUBSUB=true LOG_LEVEL=DEBUG make test-e2e ENABLE_PUBSUB_TESTS=1 - name: Save logs diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml index b192c132d31..d3730fd0173 100644 --- a/.github/workflows/upgrade.yaml +++ b/.github/workflows/upgrade.yaml @@ -42,7 +42,7 @@ jobs: - name: Deploy Helm release run: | - make e2e-helm-upgrade-init HELM_VERSION=${{ matrix.HELM_VERSION }} BASE_RELEASE=${{ env.BASE_RELEASE }} + make e2e-helm-upgrade-init HELM_VERSION=${{ matrix.HELM_VERSION }} BASE_RELEASE=${{ env.BASE_RELEASE }} LOG_LEVEL=DEBUG - name: Run e2e after install run: | @@ -85,7 +85,8 @@ jobs: HELM_VERSION=${{ matrix.HELM_VERSION }} \ HELM_REPO=gatekeeper-e2e \ HELM_CRD_REPO=gatekeeper-crds \ - HELM_RELEASE=latest + HELM_RELEASE=latest \ + LOG_LEVEL=DEBUG - name: Run e2e after upgrade run: | diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 90e178c73fc..9bfdd545a92 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -238,7 +238,8 @@ jobs: HELM_CRD_REPO=gatekeeper-crds \ HELM_RELEASE=latest \ HELM_VERSION=${{ matrix.HELM_VERSION }} \ - GATEKEEPER_NAMESPACE=${{ matrix.GATEKEEPER_NAMESPACE }} + GATEKEEPER_NAMESPACE=${{ matrix.GATEKEEPER_NAMESPACE }} \ + LOG_LEVEL=DEBUG make test-e2e \ GATEKEEPER_NAMESPACE=${{ matrix.GATEKEEPER_NAMESPACE }} diff --git a/Makefile b/Makefile index 3f2006a8ab3..48b7b246022 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ ENABLE_GENERATOR_EXPANSION ?= false ENABLE_PUBSUB ?= false AUDIT_CONNECTION ?= "audit" AUDIT_CHANNEL ?= "audit" +LOG_LEVEL ?= "INFO" VERSION := v3.16.0-beta.0 @@ -208,6 +209,7 @@ ifeq ($(ENABLE_PUBSUB),true) --set-string auditPodAnnotations.dapr\\.io/enabled=true \ --set-string auditPodAnnotations.dapr\\.io/app-id=audit \ --set-string auditPodAnnotations.dapr\\.io/metrics-port=9999 \ + --set logLevel=${LOG_LEVEL} \ --set mutationAnnotations=true; else ./.staging/helm/linux-amd64/helm install manifest_staging/charts/gatekeeper --name-template=gatekeeper \ @@ -226,6 +228,7 @@ else --set auditEventsInvolvedNamespace=true \ --set disabledBuiltins={http.send} \ --set logMutations=true \ + --set logLevel=${LOG_LEVEL} \ --set mutationAnnotations=true endif @@ -243,6 +246,7 @@ e2e-helm-upgrade-init: e2e-helm-install --set disabledBuiltins={http.send} \ --set enableExternalData=true \ --set logMutations=true \ + --set logLevel=${LOG_LEVEL} \ --set mutationAnnotations=true;\ e2e-helm-upgrade: @@ -263,6 +267,7 @@ e2e-helm-upgrade: --set auditEventsInvolvedNamespace=true \ --set disabledBuiltins={http.send} \ --set logMutations=true \ + --set logLevel=${LOG_LEVEL} \ --set mutationAnnotations=true;\ e2e-subscriber-build-load-image: