From 7a1e8c83226eac874df5d1f7d14972b56c3f7ea1 Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Mon, 14 Oct 2024 13:53:27 -0700 Subject: [PATCH 1/4] fix: smoke test for webhook e2e --- .github/workflows/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 307ad3634c2c..a0737b287997 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -145,7 +145,7 @@ jobs: enable_local_zones: ${{ inputs.suite == 'LocalZone' }} cleanup: ${{ inputs.cleanup }} codebuild_role: ${{ vars[format('{0}_CODEBUILD_ROLE', inputs.codebuild_region)] }} - webhooks_enabled: ${{ !contains(inputs.suite, 'Webhooks') }} + webhooks_enabled: ${{ inputs.suite != 'Webhooks' && true }} - name: run tests for private cluster if: ${{ inputs.workflow_trigger == 'private_cluster' }} uses: ./.github/actions/e2e/run-tests-private-cluster From 871cbfedd3da3835a988022ebccc8bf9ff8a3275 Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Mon, 14 Oct 2024 14:57:54 -0700 Subject: [PATCH 2/4] debug crd --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1704c846ef4a..099ad2b752a8 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ verify: tidy download ## Verify code. Includes dependencies, linting, formatting cp pkg/apis/crds/* charts/karpenter-crd/templates hack/mutation/conversion_webhook_injection.sh hack/github/dependabot.sh + git --no-pager diff $(foreach dir,$(MOD_DIRS),cd $(dir) && golangci-lint run $(newline)) @git diff --quiet ||\ { echo "New file modification detected in the Git working tree. Please check in before commit."; git --no-pager diff --name-only | uniq | awk '{print " - " $$0}'; \ From 12a4ccbcfacdec419274880eacb39264827c60e1 Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Mon, 14 Oct 2024 15:05:44 -0700 Subject: [PATCH 3/4] update kubebuilder --- Makefile | 1 - .../templates/karpenter.k8s.aws_ec2nodeclasses.yaml | 2 +- pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 099ad2b752a8..1704c846ef4a 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,6 @@ verify: tidy download ## Verify code. Includes dependencies, linting, formatting cp pkg/apis/crds/* charts/karpenter-crd/templates hack/mutation/conversion_webhook_injection.sh hack/github/dependabot.sh - git --no-pager diff $(foreach dir,$(MOD_DIRS),cd $(dir) && golangci-lint run $(newline)) @git diff --quiet ||\ { echo "New file modification detected in the Git working tree. Please check in before commit."; git --no-pager diff --name-only | uniq | awk '{print " - " $$0}'; \ diff --git a/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml b/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml index 52abf9243944..4d8841ca1926 100644 --- a/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml +++ b/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 name: ec2nodeclasses.karpenter.k8s.aws spec: group: karpenter.k8s.aws diff --git a/pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml b/pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml index 302961507e00..974259d37e44 100644 --- a/pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml +++ b/pkg/apis/crds/karpenter.k8s.aws_ec2nodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 name: ec2nodeclasses.karpenter.k8s.aws spec: group: karpenter.k8s.aws From e2be36601f5f92c425d4fa9d8724217f1f3532af Mon Sep 17 00:00:00 2001 From: Reed Schalo Date: Tue, 15 Oct 2024 09:58:15 -0700 Subject: [PATCH 4/4] add comment --- .github/workflows/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a0737b287997..a51fcd6596fc 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -145,7 +145,7 @@ jobs: enable_local_zones: ${{ inputs.suite == 'LocalZone' }} cleanup: ${{ inputs.cleanup }} codebuild_role: ${{ vars[format('{0}_CODEBUILD_ROLE', inputs.codebuild_region)] }} - webhooks_enabled: ${{ inputs.suite != 'Webhooks' && true }} + webhooks_enabled: ${{ inputs.suite != 'Webhooks' && true }} # Set webhooks_enabled to false if running webhook smoke test suite - name: run tests for private cluster if: ${{ inputs.workflow_trigger == 'private_cluster' }} uses: ./.github/actions/e2e/run-tests-private-cluster