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

feature: add skip upgrade cilium CNI flag to API #5298

Merged
merged 1 commit into from
Mar 20, 2023
Merged

feature: add skip upgrade cilium CNI flag to API #5298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions config/crd/bases/anywhere.eks.amazonaws.com_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ spec:
allowed between pods. Accepted values are default, always,
never.
type: string
skipUpgrade:
default: false
description: SkipUpgrade indicicates that Cilium maintenance
should be skipped during upgrades. This can be used
when operators wish to self manage the Cilium installation.
type: boolean
type: object
kindnetd:
type: object
Expand Down
6 changes: 6 additions & 0 deletions config/manifest/eksa-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3642,6 +3642,12 @@ spec:
allowed between pods. Accepted values are default, always,
never.
type: string
skipUpgrade:
default: false
description: SkipUpgrade indicicates that Cilium maintenance
should be skipped during upgrades. This can be used
when operators wish to self manage the Cilium installation.
type: boolean
type: object
kindnetd:
type: object
Expand Down
6 changes: 6 additions & 0 deletions pkg/api/v1alpha1/cluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,12 @@ type CNIConfig struct {
type CiliumConfig struct {
// PolicyEnforcementMode determines communication allowed between pods. Accepted values are default, always, never.
PolicyEnforcementMode CiliumPolicyEnforcementMode `json:"policyEnforcementMode,omitempty"`

// SkipUpgrade indicicates that Cilium maintenance should be skipped during upgrades. This can
// be used when operators wish to self manage the Cilium installation.
// +kubebuilder:default=false
// +optional
SkipUpgrade *bool `json:"skipUpgrade,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need a pointer here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To align with Kubernetes API conventions.

https://github.com/zecke/Kubernetes/blob/master/docs/devel/api-conventions.md#optional-vs-required

}

type KindnetdConfig struct{}
Expand Down
18 changes: 17 additions & 1 deletion pkg/api/v1alpha1/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.