-
Notifications
You must be signed in to change notification settings - Fork 7
feat: Add ClusterResourceSet strategy for CNI installation #288
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| // Copyright 2024 D2iQ, Inc. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" | ||
|
|
||
| "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables" | ||
| ) | ||
|
|
||
| type Addons struct { | ||
| // +optional | ||
| CNI *CNI `json:"cni,omitempty"` | ||
|
|
||
| // +optional | ||
| NFD *NFD `json:"nfd,omitempty"` | ||
|
|
||
| // +optional | ||
| CPI *CPI `json:"cpi,omitempty"` | ||
|
|
||
| // +optional | ||
| CSIProviders *CSIProviders `json:"csi,omitempty"` | ||
| } | ||
|
|
||
| func (Addons) VariableSchema() clusterv1.VariableSchema { | ||
| return clusterv1.VariableSchema{ | ||
| OpenAPIV3Schema: clusterv1.JSONSchemaProps{ | ||
| Description: "Cluster configuration", | ||
| Type: "object", | ||
| Properties: map[string]clusterv1.JSONSchemaProps{ | ||
| "cni": CNI{}.VariableSchema().OpenAPIV3Schema, | ||
| "nfd": NFD{}.VariableSchema().OpenAPIV3Schema, | ||
| "csi": CSIProviders{}.VariableSchema().OpenAPIV3Schema, | ||
| "cpi": CPI{}.VariableSchema().OpenAPIV3Schema, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| type AddonStrategy string | ||
|
|
||
| const ( | ||
| AddonStrategyClusterResourceSet AddonStrategy = "ClusterResourceSet" | ||
| ) | ||
|
|
||
| // CNI required for providing CNI configuration. | ||
| type CNI struct { | ||
| // +optional | ||
| Provider string `json:"provider,omitempty"` | ||
| // +optional | ||
| Strategy AddonStrategy `json:"strategy,omitempty"` | ||
jimmidyson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| func (CNI) VariableSchema() clusterv1.VariableSchema { | ||
| supportedCNIProviders := []string{CNIProviderCalico} | ||
|
|
||
| return clusterv1.VariableSchema{ | ||
| OpenAPIV3Schema: clusterv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| Properties: map[string]clusterv1.JSONSchemaProps{ | ||
| "provider": { | ||
| Description: "CNI provider to deploy", | ||
| Type: "string", | ||
| Enum: variables.MustMarshalValuesToEnumJSON(supportedCNIProviders...), | ||
| }, | ||
| "strategy": { | ||
| Description: "Addon strategy used to deploy the CNI provider to the workload cluster", | ||
| Type: "string", | ||
| Enum: variables.MustMarshalValuesToEnumJSON( | ||
| AddonStrategyClusterResourceSet, | ||
| ), | ||
| }, | ||
| }, | ||
| Required: []string{"provider", "strategy"}, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // NFD tells us to enable or disable the node feature discovery addon. | ||
| type NFD struct{} | ||
|
|
||
| func (NFD) VariableSchema() clusterv1.VariableSchema { | ||
| return clusterv1.VariableSchema{ | ||
| OpenAPIV3Schema: clusterv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| type CSIProviders struct { | ||
| // +optional | ||
| Providers []CSIProvider `json:"providers,omitempty"` | ||
| // +optional | ||
| DefaultClassName string `json:"defaultClassName,omitempty"` | ||
| } | ||
|
|
||
| type CSIProvider struct { | ||
| Name string `json:"name,omitempty"` | ||
| } | ||
|
|
||
| func (CSIProviders) VariableSchema() clusterv1.VariableSchema { | ||
| supportedCSIProviders := []string{CSIProviderAWSEBS} | ||
| return clusterv1.VariableSchema{ | ||
| OpenAPIV3Schema: clusterv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| Properties: map[string]clusterv1.JSONSchemaProps{ | ||
| "providers": { | ||
| Type: "array", | ||
| Items: &clusterv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| Properties: map[string]clusterv1.JSONSchemaProps{ | ||
| "name": { | ||
| Type: "string", | ||
| Enum: variables.MustMarshalValuesToEnumJSON( | ||
| supportedCSIProviders...), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "defaultClassName": { | ||
| Type: "string", | ||
| Enum: variables.MustMarshalValuesToEnumJSON(supportedCSIProviders...), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // CPI tells us to enable or disable the cloud provider interface. | ||
| type CPI struct{} | ||
|
|
||
| func (CPI) VariableSchema() clusterv1.VariableSchema { | ||
| return clusterv1.VariableSchema{ | ||
| OpenAPIV3Schema: clusterv1.JSONSchemaProps{ | ||
| Type: "object", | ||
| }, | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
charts/capi-runtime-extensions/templates/cni/calico/manifests/aws/installation.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
charts/capi-runtime-extensions/templates/cni/calico/manifests/docker/installation.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ spec: | |
| addons: | ||
| cni: | ||
| provider: calico | ||
| strategy: ClusterResourceSet | ||
| cpi: {} | ||
| csi: | ||
| providers: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.