From 3281d54c6cd7eeca73a61bab63c327b9bd8596aa Mon Sep 17 00:00:00 2001 From: Enrico Candino Date: Mon, 24 Mar 2025 10:48:42 +0100 Subject: [PATCH] fix typo (#300) --- charts/k3k/crds/k3k.io_clustersets.yaml | 4 ++-- examples/clusterset.yaml | 2 +- pkg/apis/k3k.io/v1alpha1/types.go | 4 ++-- pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go | 4 ++-- pkg/controller/clusterset/clusterset_test.go | 14 +++++++------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/k3k/crds/k3k.io_clustersets.yaml b/charts/k3k/crds/k3k.io_clustersets.yaml index e841bff3..e21e5b33 100644 --- a/charts/k3k/crds/k3k.io_clustersets.yaml +++ b/charts/k3k/crds/k3k.io_clustersets.yaml @@ -42,10 +42,10 @@ spec: default: {} description: Spec defines the desired state of the ClusterSet. properties: - allowedNodeTypes: + allowedModeTypes: default: - shared - description: AllowedNodeTypes specifies the allowed cluster provisioning + description: AllowedModeTypes specifies the allowed cluster provisioning modes. Defaults to [shared]. items: description: ClusterMode is the possible provisioning mode of a diff --git a/examples/clusterset.yaml b/examples/clusterset.yaml index fc0dd7f0..22e93204 100644 --- a/examples/clusterset.yaml +++ b/examples/clusterset.yaml @@ -4,7 +4,7 @@ metadata: name: clusterset-example # spec: # disableNetworkPolicy: false - # allowedNodeTypes: + # allowedModeTypes: # - "shared" # - "virtual" # podSecurityAdmissionLevel: "baseline" diff --git a/pkg/apis/k3k.io/v1alpha1/types.go b/pkg/apis/k3k.io/v1alpha1/types.go index d34e97c4..e22a069b 100644 --- a/pkg/apis/k3k.io/v1alpha1/types.go +++ b/pkg/apis/k3k.io/v1alpha1/types.go @@ -358,13 +358,13 @@ type ClusterSetSpec struct { // +optional MaxLimits v1.ResourceList `json:"maxLimits,omitempty"` - // AllowedNodeTypes specifies the allowed cluster provisioning modes. Defaults to [shared]. + // AllowedModeTypes specifies the allowed cluster provisioning modes. Defaults to [shared]. // // +kubebuilder:default={shared} // +kubebuilder:validation:XValidation:message="mode is immutable",rule="self == oldSelf" // +kubebuilder:validation:MinItems=1 // +optional - AllowedNodeTypes []ClusterMode `json:"allowedNodeTypes,omitempty"` + AllowedModeTypes []ClusterMode `json:"allowedModeTypes,omitempty"` // DisableNetworkPolicy indicates whether to disable the creation of a default network policy for cluster isolation. // diff --git a/pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go index 658d6a40..9366f37e 100644 --- a/pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/k3k.io/v1alpha1/zz_generated.deepcopy.go @@ -201,8 +201,8 @@ func (in *ClusterSetSpec) DeepCopyInto(out *ClusterSetSpec) { (*out)[key] = val } } - if in.AllowedNodeTypes != nil { - in, out := &in.AllowedNodeTypes, &out.AllowedNodeTypes + if in.AllowedModeTypes != nil { + in, out := &in.AllowedModeTypes, &out.AllowedModeTypes *out = make([]ClusterMode, len(*in)) copy(*out, *in) } diff --git a/pkg/controller/clusterset/clusterset_test.go b/pkg/controller/clusterset/clusterset_test.go index 7e32db70..750bfcc6 100644 --- a/pkg/controller/clusterset/clusterset_test.go +++ b/pkg/controller/clusterset/clusterset_test.go @@ -36,7 +36,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet }) When("created with a default spec", func() { - It("should have only the 'shared' allowedNodeTypes", func() { + It("should have only the 'shared' allowedModeTypes", func() { clusterSet := &v1alpha1.ClusterSet{ ObjectMeta: v1.ObjectMeta{ GenerateName: "clusterset-", @@ -47,7 +47,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet err := k8sClient.Create(ctx, clusterSet) Expect(err).To(Not(HaveOccurred())) - allowedModeTypes := clusterSet.Spec.AllowedNodeTypes + allowedModeTypes := clusterSet.Spec.AllowedModeTypes Expect(allowedModeTypes).To(HaveLen(1)) Expect(allowedModeTypes).To(ContainElement(v1alpha1.SharedClusterMode)) }) @@ -247,7 +247,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet Namespace: namespace, }, Spec: v1alpha1.ClusterSetSpec{ - AllowedNodeTypes: []v1alpha1.ClusterMode{ + AllowedModeTypes: []v1alpha1.ClusterMode{ v1alpha1.VirtualClusterMode, }, }, @@ -256,7 +256,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet err := k8sClient.Create(ctx, clusterSet) Expect(err).To(Not(HaveOccurred())) - allowedModeTypes := clusterSet.Spec.AllowedNodeTypes + allowedModeTypes := clusterSet.Spec.AllowedModeTypes Expect(allowedModeTypes).To(HaveLen(1)) Expect(allowedModeTypes).To(ContainElement(v1alpha1.VirtualClusterMode)) }) @@ -268,7 +268,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet Namespace: namespace, }, Spec: v1alpha1.ClusterSetSpec{ - AllowedNodeTypes: []v1alpha1.ClusterMode{ + AllowedModeTypes: []v1alpha1.ClusterMode{ v1alpha1.SharedClusterMode, v1alpha1.VirtualClusterMode, }, @@ -278,7 +278,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet err := k8sClient.Create(ctx, clusterSet) Expect(err).To(Not(HaveOccurred())) - allowedModeTypes := clusterSet.Spec.AllowedNodeTypes + allowedModeTypes := clusterSet.Spec.AllowedModeTypes Expect(allowedModeTypes).To(HaveLen(2)) Expect(allowedModeTypes).To(ContainElements( v1alpha1.SharedClusterMode, @@ -293,7 +293,7 @@ var _ = Describe("ClusterSet Controller", Label("controller"), Label("ClusterSet Namespace: namespace, }, Spec: v1alpha1.ClusterSetSpec{ - AllowedNodeTypes: []v1alpha1.ClusterMode{ + AllowedModeTypes: []v1alpha1.ClusterMode{ v1alpha1.SharedClusterMode, v1alpha1.VirtualClusterMode, v1alpha1.ClusterMode("non-existing"),