Skip to content

Commit

Permalink
fix: smoke test for webhook e2e (#7218) v0.36.x (#7221)
Browse files Browse the repository at this point in the history
  • Loading branch information
rschalo authored Oct 15, 2024
1 parent cf5f318 commit d1d62a0
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/actions/e2e/install-karpenter/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ inputs:
private_cluster:
description: "Whether the cluster is private or not. Valid values are 'true' or 'false'"
default: 'false'
webhooks_enabled:
description: "Whether webhooks are enabled or not. Valid values are 'true' or 'false'"
default: 'true'
runs:
using: "composite"
steps:
Expand Down Expand Up @@ -57,6 +60,7 @@ runs:
CLUSTER_NAME: ${{ inputs.cluster_name }}
K8S_VERSION: ${{ inputs.k8s_version }}
PRIVATE_CLUSTER: ${{ inputs.private_cluster }}
WEBHOOKS_ENABLED: ${{ inputs.webhooks_enabled }}
run: |
./test/hack/e2e_scripts/install_karpenter.sh
- name: diff-karpenter
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/e2e/setup-cluster/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ inputs:
default: 'false'
codebuild_role:
description: "Codebuild Role that must be given an access entry in case of private cluster"
webhooks_enabled:
description: "Whether webhooks are enabled or not. Valid values are 'true' or 'false'"
default: 'true'
runs:
using: "composite"
steps:
Expand Down Expand Up @@ -269,3 +272,4 @@ runs:
k8s_version: ${{ inputs.k8s_version }}
git_ref: ${{ inputs.git_ref }}
private_cluster: ${{ inputs.private_cluster }}
webhooks_enabled: ${{ inputs.webhooks_enabled }}
2 changes: 2 additions & 0 deletions .github/workflows/e2e-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ jobs:
region: ${{ inputs.region }}
- name: IPv6
region: ${{ inputs.region }}
- name: Webhooks
region: ${{ inputs.region }}
- name: LocalZone
# LAX is the only local zone available in the CI account, therefore only use us-west-2
region: us-west-2
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ on:
- Scale
- PrivateCluster
- LocalZone
- Webhooks
k8s_version:
type: choice
options:
Expand Down Expand Up @@ -143,6 +144,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 }} # 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
Expand Down
3 changes: 1 addition & 2 deletions test/hack/e2e_scripts/install_karpenter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ aws eks update-kubeconfig --name "$CLUSTER_NAME"

# Parse minor version to determine whether to enable the webhooks
K8S_VERSION_MINOR="${K8S_VERSION#*.}"
WEBHOOK_ENABLED=true

CHART="oci://$ECR_ACCOUNT_ID.dkr.ecr.$ECR_REGION.amazonaws.com/karpenter/snapshot/karpenter"
ADDITIONAL_FLAGS=""
Expand All @@ -16,7 +15,7 @@ helm upgrade --install karpenter "${CHART}" \
-n kube-system \
--version "0-$(git rev-parse HEAD)" \
--set logLevel=debug \
--set webhook.enabled=${WEBHOOK_ENABLED} \
--set webhook.enabled=${WEBHOOKS_ENABLED} \
--set settings.isolatedVPC=${PRIVATE_CLUSTER} \
--set serviceAccount.annotations."eks\.amazonaws\.com/role-arn"="arn:aws:iam::$ACCOUNT_ID:role/karpenter-irsa-$CLUSTER_NAME" \
$ADDITIONAL_FLAGS \
Expand Down
66 changes: 66 additions & 0 deletions test/suites/webhooks/suite_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package webhooks_test

import (
"context"
"testing"

v1beta1 "github.com/aws/karpenter-provider-aws/pkg/apis/v1beta1"
"github.com/aws/karpenter-provider-aws/test/pkg/environment/aws"

karpv1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1"

karptest "sigs.k8s.io/karpenter/pkg/test"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "knative.dev/pkg/logging/testing"
)

var ctx context.Context
var env *aws.Environment
var nodeClass *v1beta1.EC2NodeClass
var nodePool *karpv1beta1.NodePool

func TestWebhooks(t *testing.T) {
RegisterFailHandler(Fail)

ctx = TestContextWithLogger(t)
BeforeSuite(func() {
env = aws.NewEnvironment(t)
})
AfterSuite(func() {
env.Stop()
})
RunSpecs(t, "Webhooks")
}

var _ = BeforeEach(func() {
env.BeforeEach()
nodeClass = env.DefaultEC2NodeClass()
nodePool = env.DefaultNodePool(nodeClass)
})
var _ = AfterEach(func() { env.Cleanup() })
var _ = AfterEach(func() { env.AfterEach() })

var _ = Describe("Webhooks", func() {
It("should schedule pods when webhooks are disabled", func() {
pod := karptest.Pod()
env.ExpectCreated(pod, nodeClass, nodePool)
env.EventuallyExpectHealthy(pod)
env.ExpectCreatedNodeCount("==", 1)
})
})

0 comments on commit d1d62a0

Please sign in to comment.