diff --git a/apis/v1/secretproviderclass_types.go b/apis/v1/secretproviderclass_types.go index 4645c8b0a..43ef910cc 100644 --- a/apis/v1/secretproviderclass_types.go +++ b/apis/v1/secretproviderclass_types.go @@ -55,18 +55,8 @@ type SecretProviderClassSpec struct { SecretObjects []*SecretObject `json:"secretObjects,omitempty"` } -// ByPodStatus defines the state of SecretProviderClass as seen by -// an individual controller -type ByPodStatus struct { - // id of the pod that wrote the status - ID string `json:"id,omitempty"` - // namespace of the pod that wrote the status - Namespace string `json:"namespace,omitempty"` -} - // SecretProviderClassStatus defines the observed state of SecretProviderClass type SecretProviderClassStatus struct { - ByPod []*ByPodStatus `json:"byPod,omitempty"` } // +kubebuilder:object:root=true diff --git a/apis/v1/zz_generated.deepcopy.go b/apis/v1/zz_generated.deepcopy.go index d4a1d9715..43cbfaad8 100644 --- a/apis/v1/zz_generated.deepcopy.go +++ b/apis/v1/zz_generated.deepcopy.go @@ -25,21 +25,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" ) -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ByPodStatus) DeepCopyInto(out *ByPodStatus) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ByPodStatus. -func (in *ByPodStatus) DeepCopy() *ByPodStatus { - if in == nil { - return nil - } - out := new(ByPodStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SecretObject) DeepCopyInto(out *SecretObject) { *out = *in @@ -101,7 +86,7 @@ func (in *SecretProviderClass) DeepCopyInto(out *SecretProviderClass) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) + out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretProviderClass. @@ -283,17 +268,6 @@ func (in *SecretProviderClassSpec) DeepCopy() *SecretProviderClassSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SecretProviderClassStatus) DeepCopyInto(out *SecretProviderClassStatus) { *out = *in - if in.ByPod != nil { - in, out := &in.ByPod, &out.ByPod - *out = make([]*ByPodStatus, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(ByPodStatus) - **out = **in - } - } - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretProviderClassStatus. diff --git a/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml b/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml index aa177b495..fcf63c668 100644 --- a/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml +++ b/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io @@ -82,20 +82,6 @@ spec: type: object status: description: SecretProviderClassStatus defines the observed state of SecretProviderClass - properties: - byPod: - items: - description: ByPodStatus defines the state of SecretProviderClass - as seen by an individual controller - properties: - id: - description: id of the pod that wrote the status - type: string - namespace: - description: namespace of the pod that wrote the status - type: string - type: object - type: array type: object type: object served: true diff --git a/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml b/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml index 0a0121b33..0ed12b6d7 100644 --- a/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml +++ b/config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io diff --git a/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml index aa177b495..fcf63c668 100644 --- a/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml +++ b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io @@ -82,20 +82,6 @@ spec: type: object status: description: SecretProviderClassStatus defines the observed state of SecretProviderClass - properties: - byPod: - items: - description: ByPodStatus defines the state of SecretProviderClass - as seen by an individual controller - properties: - id: - description: id of the pod that wrote the status - type: string - namespace: - description: namespace of the pod that wrote the status - type: string - type: object - type: array type: object type: object served: true diff --git a/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml index 0a0121b33..0ed12b6d7 100644 --- a/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml +++ b/manifest_staging/charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io diff --git a/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml b/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml index aa177b495..fcf63c668 100644 --- a/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml +++ b/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io @@ -82,20 +82,6 @@ spec: type: object status: description: SecretProviderClassStatus defines the observed state of SecretProviderClass - properties: - byPod: - items: - description: ByPodStatus defines the state of SecretProviderClass - as seen by an individual controller - properties: - id: - description: id of the pod that wrote the status - type: string - namespace: - description: namespace of the pod that wrote the status - type: string - type: object - type: array type: object type: object served: true diff --git a/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml b/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml index 0a0121b33..0ed12b6d7 100644 --- a/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml +++ b/manifest_staging/deploy/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.12.1 name: secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io spec: group: secrets-store.csi.x-k8s.io