Skip to content

Commit

Permalink
chore: Update usage of aws/karpenter throughout the repo (#5245)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-innis authored Dec 6, 2023
1 parent f95754e commit ab2a413
Show file tree
Hide file tree
Showing 161 changed files with 673 additions and 647 deletions.
3 changes: 2 additions & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ updates:
- "k8s.io/*"
- "sigs.k8s.io/*"
- "knative.dev/*"
exclude-patterns:
- "sigs.k8s.io/karpenter"
go-deps:
patterns:
- "*"
exclude-patterns:
- "k8s.io/*"
- "sigs.k8s.io/*"
- "knative.dev/*"
- "github.com/aws/karpenter-core"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codegen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
id-token: write # aws-actions/[email protected]
pull-requests: write # name: Create Pull Request
contents: write # name: Create Pull Request
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- cron: '0 12 * * *'
jobs:
analyze:
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
name: Analyze
runs-on: ubuntu-latest
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deflake.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
jobs:
deflake:
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
docgen-ci:
permissions:
id-token: write # aws-actions/[email protected]
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-matrix-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
type: boolean
jobs:
resolve:
if: (github.repository == 'aws/karpenter' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
if: (github.repository == 'aws/karpenter-provider-aws' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/resolve-args.yaml
with:
allowed_comment: "snapshot"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-scale-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
type: boolean
jobs:
resolve:
if: (github.repository == 'aws/karpenter' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
if: (github.repository == 'aws/karpenter-provider-aws' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/resolve-args.yaml
with:
allowed_comment: "scale"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-version-compatibility-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
type: boolean
jobs:
resolve:
if: (github.repository == 'aws/karpenter' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
if: (github.repository == 'aws/karpenter-provider-aws' && (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success')) || github.event_name == 'workflow_dispatch'
uses: ./.github/workflows/resolve-args.yaml
with:
allowed_comment: "versionCompatibility"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-test-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
publish-tools:
permissions:
id-token: write # aws-actions/[email protected]
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
id-token: write # aws-actions/[email protected]
contents: write # marvinpinto/[email protected]
pull-requests: write # name: Create PR
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
'Stable Release Changes for ' + tag + '.',
'Please disregard this PR if it is for a patch release.',
'Please remove the branch after merging.',
'This PR is generated by [StableRelease](https://github.com/aws/karpenter/actions/workflows/stable-release.yml).'
'This PR is generated by [StableRelease](https://github.com/aws/karpenter-provider-aws/actions/workflows/stable-release.yml).'
].join('\n')
});
github.rest.issues.addLabels({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
release:
permissions:
id-token: write # aws-actions/[email protected]
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
permissions:
issues: write # actions/[email protected]
pull-requests: write # actions/[email protected]
if: github.repository == 'aws/karpenter'
if: github.repository == 'aws/karpenter-provider-aws'
name: Stale issue bot
steps:
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ linters-settings:
locale: US
ignore-words: []
goimports:
local-prefixes: github.com/aws/karpenter
local-prefixes: github.com/aws/karpenter-provider-aws
goheader:
template: |-
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ setup: ## Sets up the IAM roles needed prior to deploying the karpenter-controll
CLUSTER_NAME=${CLUSTER_NAME} ./$(GETTING_STARTED_SCRIPT_DIR)/add-roles.sh $(KARPENTER_VERSION)

image: ## Build the Karpenter controller images using ko build
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KO_DOCKER_REPO)" ko build --bare github.com/aws/karpenter/cmd/controller))
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KO_DOCKER_REPO)" ko build --bare github.com/aws/karpenter-provider-aws/cmd/controller))
$(eval IMG_REPOSITORY=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 1 | cut -d ":" -f 1))
$(eval IMG_TAG=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 1 | cut -d ":" -f 2 -s))
$(eval IMG_DIGEST=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 2))
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![CI](https://github.com/aws/karpenter/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/aws/karpenter/actions/workflows/ci.yaml)
![GitHub stars](https://img.shields.io/github/stars/aws/karpenter)
![GitHub forks](https://img.shields.io/github/forks/aws/karpenter)
[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/aws/karpenter/blob/main/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/aws/karpenter)](https://goreportcard.com/report/github.com/aws/karpenter)
[![Coverage Status](https://coveralls.io/repos/github/aws/karpenter/badge.svg?branch=main)](https://coveralls.io/github/aws/karpenter?branch=main)
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/aws/karpenter/issues)
[![CI](https://github.com/aws/karpenter-provider-aws/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/aws/karpenter/actions/workflows/ci.yaml)
![GitHub stars](https://img.shields.io/github/stars/aws/karpenter-provider-aws)
![GitHub forks](https://img.shields.io/github/forks/aws/karpenter-provider-aws)
[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/aws/karpenter-provider-aws/blob/main/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/aws/karpenter-provider-aws)](https://goreportcard.com/report/github.com/aws/karpenter)
[![Coverage Status](https://coveralls.io/repos/github/aws/karpenter-provider-aws/badge.svg?branch=main)](https://coveralls.io/github/aws/karpenter?branch=main)
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/aws/karpenter-provider-aws/issues)

![](website/static/banner.png)

Expand Down
8 changes: 4 additions & 4 deletions cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package main
import (
"github.com/samber/lo"

"github.com/aws/karpenter/pkg/cloudprovider"
"github.com/aws/karpenter/pkg/controllers"
"github.com/aws/karpenter/pkg/operator"
"github.com/aws/karpenter/pkg/webhooks"
"github.com/aws/karpenter-provider-aws/pkg/cloudprovider"
"github.com/aws/karpenter-provider-aws/pkg/controllers"
"github.com/aws/karpenter-provider-aws/pkg/operator"
"github.com/aws/karpenter-provider-aws/pkg/webhooks"

"sigs.k8s.io/karpenter/pkg/cloudprovider/metrics"
corecontrollers "sigs.k8s.io/karpenter/pkg/controllers"
Expand Down
4 changes: 2 additions & 2 deletions designs/deprovisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ As more mechanisms

### DeprovisioningAction Tunables

With `DeprovisioningActions`, Karpenter will expand the [Internal Tunables](https://github.com/aws/karpenter/blob/main/designs/consolidation.md#internal-tunables) for each of the new `DeprovisioningActions`.
With `DeprovisioningActions`, Karpenter will expand the [Internal Tunables](https://github.com/aws/karpenter-provider-aws/blob/main/designs/consolidation.md#internal-tunables) for each of the new `DeprovisioningActions`.

* Order of Node Evaluation - In order, Karpenter will deprovision expired nodes, drifted nodes, then consolidatable nodes. Karpenter will prioritize any custom provider deprovisioning mechanisms such as health checks before any other.
* DeprovisioningTTL - Karpenter consolidation uses a Consolidation TTL per-node. Going forward Karpenter will use a DeprovisioningTTL of 15 seconds for all deprovisioning methods. These can be tuned to be more granular in the future.
* Replacement Node Timeout - Currently this is [9.5 minutes](https://github.com/aws/karpenter/blob/main/pkg/controllers/consolidation/controller.go#L70). Karpenter will not change this.
* Replacement Node Timeout - Currently this is [9.5 minutes](https://github.com/aws/karpenter-provider-aws/blob/main/pkg/controllers/consolidation/controller.go#L70). Karpenter will not change this.

## Benefits of the Deprovisioning Controller

Expand Down
4 changes: 2 additions & 2 deletions designs/node-upgrades.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Overview

Karpenter users are requesting for Node Upgrades, generally asking for [more complex node control](https://github.com/aws/karpenter/issues/1738) (91 up-votes and counting). While early versions of Karpenter meant for Provisioners to dictate node provisioning requirements and simple termination methods, Provisioners are becoming more semantically aligned with Node Groups. This is seen with [Provisioners owning nodes](https://github.com/aws/karpenter/pull/1934) and [Consolidation](https://github.com/aws/karpenter/pull/2123), where Karpenter controls the cluster in more ways than provisioning nodes for pending pods. To further align the Provisioner to represent a desired state of both new and existing nodes, Karpenter will implement [Node AMI Upgrades](https://github.com/aws/karpenter/issues/1716) by detecting and remediating drifted nodes.
Karpenter users are requesting for Node Upgrades, generally asking for [more complex node control](https://github.com/aws/karpenter-provider-aws/issues/1738) (91 up-votes and counting). While early versions of Karpenter meant for Provisioners to dictate node provisioning requirements and simple termination methods, Provisioners are becoming more semantically aligned with Node Groups. This is seen with [Provisioners owning nodes](https://github.com/aws/karpenter/pull/1934) and [Consolidation](https://github.com/aws/karpenter/pull/2123), where Karpenter controls the cluster in more ways than provisioning nodes for pending pods. To further align the Provisioner to represent a desired state of both new and existing nodes, Karpenter will implement [Node AMI Upgrades](https://github.com/aws/karpenter/issues/1716) by detecting and remediating drifted nodes.

For the initial implementation, Karpenter's drift will reconcile when a node's AMI drifts from provisioning requirements. This mechanism will be scalable to other methods of drift reconciliation in the future. Addtionally, Karpenter can implement Imperative Upgrades or Maintenance Windows in the future.

Expand Down Expand Up @@ -78,7 +78,7 @@ Karpenter can upgrade nodes in parallel with a series of hard-coded defaults. Ma

*Upgrade serially*. If Karpenter upgrades in parallel and uses an API such as NDB, users will need to use NDBs to safely onboard to automatic updates. Newer users may find this too complicated and disable automatic upgrades altogether. If Karpenter hard-codes defaults into the process, some cases may end up working poorly for existing users.

Upgrading serially requires no additional API or hard-coded hyper-parameters. It creates simple requirements on upgrades, and solves some of the existing problems of jitter (https://github.com/aws/karpenter/issues/1884), more granular expiration conditions (https://github.com/aws/karpenter/issues/903), and rate-limiting (https://github.com/aws/karpenter/issues/1018). Upgrading serially is additionally extendable to various forms of the parallel upgrades as called out in each of the sections. Should users want quicker upgrades in the future, Karpenter has a path forward to implementing parallel upgrades.
Upgrading serially requires no additional API or hard-coded hyper-parameters. It creates simple requirements on upgrades, and solves some of the existing problems of jitter (https://github.com/aws/karpenter-provider-aws/issues/1884), more granular expiration conditions (https://github.com/aws/karpenter/issues/903), and rate-limiting (https://github.com/aws/karpenter/issues/1018). Upgrading serially is additionally extendable to various forms of the parallel upgrades as called out in each of the sections. Should users want quicker upgrades in the future, Karpenter has a path forward to implementing parallel upgrades.

## What can interfere with upgrades?

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module github.com/aws/karpenter
module github.com/aws/karpenter-provider-aws

go 1.21

require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/PuerkitoBio/goquery v1.8.1
github.com/avast/retry-go v3.0.0+incompatible
github.com/aws/aws-sdk-go v1.48.11
github.com/aws/karpenter/tools/kompat v0.0.0-20231010173459-62c25a3ea85c
github.com/go-logr/zapr v1.3.0
Expand Down Expand Up @@ -36,6 +35,7 @@ require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
Expand Down
6 changes: 3 additions & 3 deletions hack/code/prices_gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/aws/karpenter/pkg/operator/options"
"github.com/aws/karpenter/pkg/providers/pricing"
"github.com/aws/karpenter/pkg/test"
"github.com/aws/karpenter-provider-aws/pkg/operator/options"
"github.com/aws/karpenter-provider-aws/pkg/providers/pricing"
"github.com/aws/karpenter-provider-aws/pkg/test"
)

func getAWSRegions(partition string) []string {
Expand Down
3 changes: 2 additions & 1 deletion hack/docs/configuration_gen_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import (
"os"
"strings"

"github.com/aws/karpenter/pkg/operator/options"
coreoptions "sigs.k8s.io/karpenter/pkg/operator/options"

"github.com/aws/karpenter-provider-aws/pkg/operator/options"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions hack/docs/instancetypes_gen_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
coreoptions "sigs.k8s.io/karpenter/pkg/operator/options"
coretest "sigs.k8s.io/karpenter/pkg/test"

awscloudprovider "github.com/aws/karpenter/pkg/cloudprovider"
"github.com/aws/karpenter/pkg/operator"
"github.com/aws/karpenter/pkg/operator/options"
"github.com/aws/karpenter/pkg/test"
awscloudprovider "github.com/aws/karpenter-provider-aws/pkg/cloudprovider"
"github.com/aws/karpenter-provider-aws/pkg/operator"
"github.com/aws/karpenter-provider-aws/pkg/operator/options"
"github.com/aws/karpenter-provider-aws/pkg/test"

"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/utils/resources"
Expand Down
2 changes: 1 addition & 1 deletion hack/docs/version_compatibility.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"
"strings"

"github.com/aws/karpenter/pkg/providers/version"
"github.com/aws/karpenter-provider-aws/pkg/providers/version"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions hack/github/community-contributors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ ! $# -gt 0 ]; then
curl -s \
-H "Accept: application/vnd.github+json" \
-H "Authorization: token $TOKEN" \
https://api.github.com/repos/aws/karpenter/releases
https://api.github.com/repos/aws/karpenter-provider-aws/releases
)
LATEST=$(echo $RELEASES | jq -r ".[0].tag_name")
PREVIOUS=$(echo $RELEASES | jq -r ".[1].tag_name")
Expand All @@ -25,7 +25,7 @@ COMMITS_PER_PAGE=500
RESPONSE=$(
gh api \
-H "Accept: application/vnd.github+json" \
/repos/aws/karpenter/compare/$PREVIOUS...$LATEST?per_page=$COMMITS_PER_PAGE
/repos/aws/karpenter-provider-aws/compare/$PREVIOUS...$LATEST?per_page=$COMMITS_PER_PAGE
)
TOTAL_COMMITS=$(echo $RESPONSE | jq -r ".total_commits")
PAGES=$(echo $((($TOTAL_COMMITS + $COMMITS_PER_PAGE - 1) / $COMMITS_PER_PAGE)))
Expand All @@ -35,7 +35,7 @@ for i in $(seq 1 $PAGES); do
NEXT=$(
gh api \
-H "Accept: application/vnd.github+json" \
/repos/aws/karpenter/compare/$PREVIOUS...$LATEST?per_page=$COMMITS_PER_PAGE\&page=$i | jq -r ".commits"
/repos/aws/karpenter-provider-aws/compare/$PREVIOUS...$LATEST?per_page=$COMMITS_PER_PAGE\&page=$i | jq -r ".commits"
)
COMMITS=$(jq -s 'add' <(echo "$COMMITS") <(echo "$NEXT"))
done
Expand Down
2 changes: 1 addition & 1 deletion hack/github/feature_request_reactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
PLUS_ONE_REACTION_STRINGS = ['+1', 'heart', 'hooray', 'rocket', 'eyes']
ISSUE_LABELS = ['feature']

repo: Repository = github.get_repo('aws/karpenter')
repo: Repository = github.get_repo('aws/karpenter-provider-aws')
open_issues = repo.get_issues(state='open', labels=ISSUE_LABELS)
for issue in open_issues:
# count unique +1s
Expand Down
2 changes: 1 addition & 1 deletion hack/github/label_issue_count.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
issue_label_counts: dict[str, int] = {}
PLUS_ONE_REACTION_STRINGS = {'+1', 'heart', 'hooray', 'rocket', 'eyes'}

repo: Repository = github.get_repo('aws/karpenter')
repo: Repository = github.get_repo('aws/karpenter-provider-aws')
open_issues = repo.get_issues(state='open')
for issue in open_issues:
for label in issue.get_labels():
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"

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

"github.com/samber/lo"

Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/v1beta1/ec2nodeclass_hash_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"github.com/imdario/mergo"
"github.com/samber/lo"

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

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"github.com/aws/karpenter/pkg/apis/v1beta1"
"github.com/aws/karpenter/pkg/test"
)

var _ = Describe("Hash", func() {
Expand Down
9 changes: 5 additions & 4 deletions pkg/apis/v1beta1/ec2nodeclass_validation_cel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ package v1beta1_test

import (
"github.com/aws/aws-sdk-go/aws"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/samber/lo"
"k8s.io/apimachinery/pkg/api/resource"
corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1"

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

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

var _ = Describe("CEL/Validation", func() {
Expand Down
9 changes: 5 additions & 4 deletions pkg/apis/v1beta1/ec2nodeclass_validation_webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ limitations under the License.
package v1beta1_test

import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/samber/lo"
"k8s.io/apimachinery/pkg/api/resource"
"knative.dev/pkg/apis"

"github.com/aws/aws-sdk-go/aws"

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

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

var _ = Describe("Webhook/Validation", func() {
Expand Down
Loading

0 comments on commit ab2a413

Please sign in to comment.