Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(karpenter): upgrade karpenter to v0.32.6 #16327

Closed
wants to merge 3 commits into from
Closed

chore(karpenter): upgrade karpenter to v0.32.6 #16327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46b06d2
upgrade karpenter to version 0.32.6
moshevayner Feb 8, 2024
d6a8d80
make crds apimachinery
moshevayner Feb 8, 2024
3a76e1f
hack/update-expected
moshevayner Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,11 +1561,20 @@ spec:
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
disruption:
properties:
consolidateAfter:
type: string
consolidationPolicy:
type: string
expireAfter:
type: string
type: object
enabled:
type: boolean
image:
type: string
logEncoding:
logFormat:
type: string
logLevel:
type: string
Expand Down
21 changes: 14 additions & 7 deletions pkg/apis/kops/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,21 @@ type HetznerSpec struct{}
type ScalewaySpec struct {
}

type KarpenterDisruption struct {
ConsolidationPolicy string `json:"consolidationPolicy,omitempty"`
ConsolidateAfter string `json:"consolidateAfter,omitempty"`
ExpireAfter string `json:"expireAfter,omitempty"`
}

type KarpenterConfig struct {
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logFormat,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logFormat,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Disruption *KarpenterDisruption `json:"disruption,omitempty"`
}

// ServiceAccountIssuerDiscoveryConfig configures an OIDC Issuer.
Expand Down
21 changes: 14 additions & 7 deletions pkg/apis/kops/v1alpha2/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,21 @@ type PodIdentityWebhookSpec struct {
Replicas int `json:"replicas,omitempty"`
}

type KarpenterDisruption struct {
ConsolidationPolicy string `json:"consolidationPolicy,omitempty"`
ConsolidateAfter string `json:"consolidateAfter,omitempty"`
ExpireAfter string `json:"expireAfter,omitempty"`
}

type KarpenterConfig struct {
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logEncoding,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logFormat,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Disruption *KarpenterDisruption `json:"disruption,omitempty"`
}

// ServiceAccountIssuerDiscoveryConfig configures an OIDC Issuer.
Expand Down
52 changes: 52 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions pkg/apis/kops/v1alpha3/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,21 @@ type HetznerSpec struct{}
type ScalewaySpec struct {
}

type KarpenterDisruption struct {
ConsolidationPolicy string `json:"consolidationPolicy,omitempty"`
ConsolidateAfter string `json:"consolidateAfter,omitempty"`
ExpireAfter string `json:"expireAfter,omitempty"`
}

type KarpenterConfig struct {
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logEncoding,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Enabled bool `json:"enabled,omitempty"`
LogEncoding string `json:"logFormat,omitempty"`
LogLevel string `json:"logLevel,omitempty"`
Image string `json:"image,omitempty"`
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
Disruption *KarpenterDisruption `json:"disruption,omitempty"`
}

// ServiceAccountIssuerDiscoveryConfig configures an OIDC Issuer.
Expand Down
52 changes: 52 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/model/components/karpenter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/kops/upup/pkg/fi/loader"
)

// KarpenterOptionsBuilder adds options for the cilium to the model
// KarpenterOptionsBuilder adds options for karpenter to the model
type KarpenterOptionsBuilder struct {
Context *OptionsContext
}
Expand All @@ -36,7 +36,7 @@ func (b *KarpenterOptionsBuilder) BuildOptions(o interface{}) error {
}

if c.Image == "" {
c.Image = "public.ecr.aws/karpenter/controller:v0.31.3"
c.Image = "public.ecr.aws/karpenter/controller:v0.32.6"
}

if c.LogEncoding == "" {
Expand Down
Loading
Loading