From e6ec90d094cc7aeb6239aabf511b571a6b34fe77 Mon Sep 17 00:00:00 2001 From: pjuarezd Date: Sun, 12 May 2024 12:15:05 -0700 Subject: [PATCH] Rename PolicyBinding API form `v1alpha1` to `v1beta1` Signed-off-by: pjuarezd --- Makefile | 2 +- docs/STS.md | 2 +- docs/policybinding_crd.adoc | 4 +- examples/kustomization/sts-example/README.md | 4 +- .../sample-data/mc-job-policy-binding.yaml | 2 +- .../sts-example/sts-app/policy-binding.yaml | 2 +- .../templates/sts.min.io_policybindings.yaml | 2 +- k8s/update-codegen.sh | 2 +- .../sts.min.io/{v1alpha1 => v1beta1}/doc.go | 6 +- .../{v1alpha1 => v1beta1}/register.go | 4 +- .../sts.min.io/{v1alpha1 => v1beta1}/types.go | 2 +- .../zz_generated.deepcopy.go | 2 +- .../{v1alpha1 => v1beta1}/application.go | 2 +- .../{v1alpha1 => v1beta1}/policybinding.go | 4 +- .../policybindingspec.go | 2 +- .../policybindingstatus.go | 2 +- .../policybindingusage.go | 2 +- pkg/client/applyconfiguration/utils.go | 26 ++--- pkg/client/clientset/versioned/clientset.go | 16 +-- .../versioned/fake/clientset_generated.go | 10 +- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../sts.min.io/{v1alpha1 => v1beta1}/doc.go | 2 +- .../{v1alpha1 => v1beta1}/fake/doc.go | 0 .../fake/fake_policybinding.go | 64 ++++++------ .../fake/fake_sts.min.io_client.go | 8 +- .../generated_expansion.go | 2 +- .../{v1alpha1 => v1beta1}/policybinding.go | 56 +++++------ .../sts.min.io_client.go | 36 +++---- .../informers/externalversions/generic.go | 8 +- .../externalversions/sts.min.io/interface.go | 12 +-- .../{v1alpha1 => v1beta1}/interface.go | 2 +- .../{v1alpha1 => v1beta1}/policybinding.go | 20 ++-- .../sts.min.io/v1alpha1/policybinding.go | 2 +- .../sts.min.io/v1beta1/expansion_generated.go | 27 +++++ .../sts.min.io/v1beta1/policybinding.go | 99 +++++++++++++++++++ pkg/controller/controller.go | 6 +- pkg/controller/job-controller.go | 4 +- pkg/controller/main-controller.go | 2 +- pkg/controller/sts_handlers.go | 6 +- release.sh | 2 +- .../base/crds/sts.min.io_policybindings.yaml | 2 +- 42 files changed, 296 insertions(+), 170 deletions(-) rename pkg/apis/sts.min.io/{v1alpha1 => v1beta1}/doc.go (88%) rename pkg/apis/sts.min.io/{v1alpha1 => v1beta1}/register.go (97%) rename pkg/apis/sts.min.io/{v1alpha1 => v1beta1}/types.go (99%) rename pkg/apis/sts.min.io/{v1alpha1 => v1beta1}/zz_generated.deepcopy.go (99%) rename pkg/client/applyconfiguration/sts.min.io/{v1alpha1 => v1beta1}/application.go (99%) rename pkg/client/applyconfiguration/sts.min.io/{v1alpha1 => v1beta1}/policybinding.go (99%) rename pkg/client/applyconfiguration/sts.min.io/{v1alpha1 => v1beta1}/policybindingspec.go (99%) rename pkg/client/applyconfiguration/sts.min.io/{v1alpha1 => v1beta1}/policybindingstatus.go (99%) rename pkg/client/applyconfiguration/sts.min.io/{v1alpha1 => v1beta1}/policybindingusage.go (99%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/doc.go (98%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/fake/doc.go (100%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/fake/fake_policybinding.go (71%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/fake/fake_sts.min.io_client.go (80%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/generated_expansion.go (97%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/policybinding.go (77%) rename pkg/client/clientset/versioned/typed/sts.min.io/{v1alpha1 => v1beta1}/sts.min.io_client.go (69%) rename pkg/client/informers/externalversions/sts.min.io/{v1alpha1 => v1beta1}/interface.go (99%) rename pkg/client/informers/externalversions/sts.min.io/{v1alpha1 => v1beta1}/policybinding.go (84%) create mode 100644 pkg/client/listers/sts.min.io/v1beta1/expansion_generated.go create mode 100644 pkg/client/listers/sts.min.io/v1beta1/policybinding.go diff --git a/Makefile b/Makefile index abc981e1800..28dc8b41c0d 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ regen-crd: regen-crd-docs: @echo "Installing crd-ref-docs" && GO111MODULE=on go install -v github.com/elastic/crd-ref-docs@latest @${GOPATH}/bin/crd-ref-docs --source-path=./pkg/apis/minio.min.io/v2 --config=docs/templates/config.yaml --renderer=asciidoctor --output-path=docs/tenant_crd.adoc --templates-dir=docs/templates/asciidoctor/ - @${GOPATH}/bin/crd-ref-docs --source-path=./pkg/apis/sts.min.io/v1alpha1 --config=docs/templates/config.yaml --renderer=asciidoctor --output-path=docs/policybinding_crd.adoc --templates-dir=docs/templates/asciidoctor/ + @${GOPATH}/bin/crd-ref-docs --source-path=./pkg/apis/sts.min.io/v1beta11 --config=docs/templates/config.yaml --renderer=asciidoctor --output-path=docs/policybinding_crd.adoc --templates-dir=docs/templates/asciidoctor/ @${GOPATH}/bin/crd-ref-docs --source-path=./pkg/apis/job.min.io/v1alpha1 --config=docs/templates/config.yaml --renderer=asciidoctor --output-path=docs/job_crd.adoc --templates-dir=docs/templates/asciidoctor/ generate-code: diff --git a/docs/STS.md b/docs/STS.md index 857ceb0b500..eb017a286d9 100644 --- a/docs/STS.md +++ b/docs/STS.md @@ -2,7 +2,7 @@ **Native IAM Authentication for Kubernetes.** -> ⚠️ This feature is an alpha release and is subject to breaking changes in future releases. +> ⚠️ This feature is an Beta release starting Operator v6.x, was released in Beta on Operator v5.x MinIO Operator offers support for [Secure Tokens](https://min.io/docs/minio/linux/developers/security-token-service.html?ref=op-gh) (a.k.a. STS) which diff --git a/docs/policybinding_crd.adoc b/docs/policybinding_crd.adoc index cef8cb1b8ba..8f29bd960f7 100644 --- a/docs/policybinding_crd.adoc +++ b/docs/policybinding_crd.adoc @@ -9,9 +9,9 @@ [id="{anchor_prefix}-sts-min-io-v1alpha1"] -=== sts.min.io/v1alpha1 +=== sts.min.io/v1beta1 -Package v1alpha1 - The following parameters are specific to the `sts.min.io/v1alpha1` MinIO Policy Binding CRD API +Package v1beta1 - The following parameters are specific to the `sts.min.io/v1beta1` MinIO Policy Binding CRD API PolicyBinding is an Authorization mechanism managed by the Minio Operator. Using Kubernetes ServiceAccount JSON Web Tokens the binding allow a ServiceAccount to assume temporary IAM credentials. For more complete documentation on this object, see the https://docs.min.io/minio/k8s/reference/minio-operator-reference.html#minio-operator-yaml-reference[MinIO Kubernetes Documentation]. diff --git a/examples/kustomization/sts-example/README.md b/examples/kustomization/sts-example/README.md index d45852a75e6..2c642c90d95 100644 --- a/examples/kustomization/sts-example/README.md +++ b/examples/kustomization/sts-example/README.md @@ -2,7 +2,7 @@ Each example in this folder contains an example using a different SDK on how to adopt Operator's STS. -> ⚠️ This feature is an alpha release and is subject to breaking changes in future releases. +> ⚠️ This feature is an Beta release now starting Operator v6.x, Operator v5.x released STS as v1alpha1. # Requirements @@ -58,7 +58,7 @@ namespace `minio-tenant-1` by installing a `PolicyBinding` on the `minio-tenant- Example policy binding (see CRD documentation in [policybinding_crd.adoc](../../../docs/policybinding_crd.adoc) ) ```yaml -apiVersion: sts.min.io/v1alpha1 +apiVersion: sts.min.io/v1beta1 kind: PolicyBinding metadata: name: binding-1 diff --git a/examples/kustomization/sts-example/sample-data/mc-job-policy-binding.yaml b/examples/kustomization/sts-example/sample-data/mc-job-policy-binding.yaml index e676e9996e4..92be418150b 100644 --- a/examples/kustomization/sts-example/sample-data/mc-job-policy-binding.yaml +++ b/examples/kustomization/sts-example/sample-data/mc-job-policy-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: sts.min.io/v1alpha1 +apiVersion: sts.min.io/v1beta1 kind: PolicyBinding metadata: name: mc-job-binding diff --git a/examples/kustomization/sts-example/sts-app/policy-binding.yaml b/examples/kustomization/sts-example/sts-app/policy-binding.yaml index 13136d858e1..ac1ad721354 100644 --- a/examples/kustomization/sts-example/sts-app/policy-binding.yaml +++ b/examples/kustomization/sts-example/sts-app/policy-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: sts.min.io/v1alpha1 +apiVersion: sts.min.io/v1beta1 kind: PolicyBinding metadata: name: binding-1 diff --git a/helm/operator/templates/sts.min.io_policybindings.yaml b/helm/operator/templates/sts.min.io_policybindings.yaml index a2bc9a8aca4..a0890d6b8e3 100644 --- a/helm/operator/templates/sts.min.io_policybindings.yaml +++ b/helm/operator/templates/sts.min.io_policybindings.yaml @@ -24,7 +24,7 @@ spec: - jsonPath: .metadata.creationTimestamp name: Age type: date - name: v1alpha1 + name: v1beta1 schema: openAPIV3Schema: properties: diff --git a/k8s/update-codegen.sh b/k8s/update-codegen.sh index 3f7d66b7ad3..59e6764006d 100755 --- a/k8s/update-codegen.sh +++ b/k8s/update-codegen.sh @@ -43,7 +43,7 @@ chmod +x ${CODEGEN_PKG}/generate-internal-groups.sh cd ${SCRIPT_ROOT} ${CODEGEN_PKG}/generate-groups.sh "all" \ $ROOT_PKG/pkg/client $ROOT_PKG/pkg/apis \ - "minio.min.io:v2 sts.min.io:v1alpha1 job.min.io:v1alpha1" \ + "minio.min.io:v2 sts.min.io:v1beta1 job.min.io:v1alpha1" \ --output-base "${TEMP_DIR}" \ --go-header-file "k8s/boilerplate.go.txt" diff --git a/pkg/apis/sts.min.io/v1alpha1/doc.go b/pkg/apis/sts.min.io/v1beta1/doc.go similarity index 88% rename from pkg/apis/sts.min.io/v1alpha1/doc.go rename to pkg/apis/sts.min.io/v1beta1/doc.go index 3d55d26738c..ab7904a5a5c 100644 --- a/pkg/apis/sts.min.io/v1alpha1/doc.go +++ b/pkg/apis/sts.min.io/v1beta1/doc.go @@ -15,11 +15,11 @@ // +k8s:deepcopy-gen=package,register // go:generate controller-gen crd:trivialVersions=true paths=. output:dir=. -// Package v1alpha1 - The following parameters are specific to the `sts.min.io/v1alpha1` MinIO Policy Binding CRD API +// Package v1beta1 - The following parameters are specific to the `sts.min.io/vv1beta1` MinIO Policy Binding CRD API // PolicyBinding is an Authorization mechanism managed by the Minio Operator. // Using Kubernetes ServiceAccount JSON Web Tokens the binding allow a ServiceAccount to assume temporary IAM credentials. // For more complete documentation on this object, see the https://docs.min.io/minio/k8s/reference/minio-operator-reference.html#minio-operator-yaml-reference[MinIO Kubernetes Documentation]. // PolicyBinding is added as part of the MinIO Operator v5.0.0. + // +groupName=sts.min.io -// +versionName=v1alpha1 -package v1alpha1 +// +versionName=v1beta1 +package v1beta1 diff --git a/pkg/apis/sts.min.io/v1alpha1/register.go b/pkg/apis/sts.min.io/v1beta1/register.go similarity index 97% rename from pkg/apis/sts.min.io/v1alpha1/register.go rename to pkg/apis/sts.min.io/v1beta1/register.go index f8daca904a9..498c0318ac0 100644 --- a/pkg/apis/sts.min.io/v1alpha1/register.go +++ b/pkg/apis/sts.min.io/v1beta1/register.go @@ -12,7 +12,7 @@ // You should have received a copy of the GNU Affero General Public License, version 3, // along with this program. If not, see -package v1alpha1 +package v1beta1 import ( operator "github.com/minio/operator/pkg/apis/sts.min.io" @@ -22,7 +22,7 @@ import ( ) // Version specifies the API Version -const Version = "v1alpha1" +const Version = "v1beta1" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: operator.GroupName, Version: Version} diff --git a/pkg/apis/sts.min.io/v1alpha1/types.go b/pkg/apis/sts.min.io/v1beta1/types.go similarity index 99% rename from pkg/apis/sts.min.io/v1alpha1/types.go rename to pkg/apis/sts.min.io/v1beta1/types.go index ba7113667a3..35c31eddc05 100644 --- a/pkg/apis/sts.min.io/v1alpha1/types.go +++ b/pkg/apis/sts.min.io/v1beta1/types.go @@ -12,7 +12,7 @@ // You should have received a copy of the GNU Affero General Public License, version 3, // along with this program. If not, see -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/sts.min.io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/sts.min.io/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/sts.min.io/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/sts.min.io/v1beta1/zz_generated.deepcopy.go index 5dce41962f4..7c1d2e46736 100644 --- a/pkg/apis/sts.min.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/sts.min.io/v1beta1/zz_generated.deepcopy.go @@ -19,7 +19,7 @@ // Code generated by deepcopy-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/application.go b/pkg/client/applyconfiguration/sts.min.io/v1beta1/application.go similarity index 99% rename from pkg/client/applyconfiguration/sts.min.io/v1alpha1/application.go rename to pkg/client/applyconfiguration/sts.min.io/v1beta1/application.go index 65edc593941..d81b8a37ff0 100644 --- a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/application.go +++ b/pkg/client/applyconfiguration/sts.min.io/v1beta1/application.go @@ -16,7 +16,7 @@ // Code generated by applyconfiguration-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 // ApplicationApplyConfiguration represents an declarative configuration of the Application type for use // with apply. diff --git a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybinding.go b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybinding.go similarity index 99% rename from pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybinding.go rename to pkg/client/applyconfiguration/sts.min.io/v1beta1/policybinding.go index 7ec3e5f80c8..f5c5587641e 100644 --- a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybinding.go +++ b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybinding.go @@ -16,7 +16,7 @@ // Code generated by applyconfiguration-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,7 +40,7 @@ func PolicyBinding(name, namespace string) *PolicyBindingApplyConfiguration { b.WithName(name) b.WithNamespace(namespace) b.WithKind("PolicyBinding") - b.WithAPIVersion("sts.min.io/v1alpha1") + b.WithAPIVersion("sts.min.io/v1beta1") return b } diff --git a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingspec.go b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingspec.go similarity index 99% rename from pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingspec.go rename to pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingspec.go index f10cfa65136..be02e40f1b5 100644 --- a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingspec.go +++ b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingspec.go @@ -16,7 +16,7 @@ // Code generated by applyconfiguration-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 // PolicyBindingSpecApplyConfiguration represents an declarative configuration of the PolicyBindingSpec type for use // with apply. diff --git a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingstatus.go b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingstatus.go similarity index 99% rename from pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingstatus.go rename to pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingstatus.go index 0609e29e7c0..b703ae2a1c6 100644 --- a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingstatus.go +++ b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingstatus.go @@ -16,7 +16,7 @@ // Code generated by applyconfiguration-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 // PolicyBindingStatusApplyConfiguration represents an declarative configuration of the PolicyBindingStatus type for use // with apply. diff --git a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingusage.go b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingusage.go similarity index 99% rename from pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingusage.go rename to pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingusage.go index 83c4ab833f5..e25e4c44360 100644 --- a/pkg/client/applyconfiguration/sts.min.io/v1alpha1/policybindingusage.go +++ b/pkg/client/applyconfiguration/sts.min.io/v1beta1/policybindingusage.go @@ -16,7 +16,7 @@ // Code generated by applyconfiguration-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 // PolicyBindingUsageApplyConfiguration represents an declarative configuration of the PolicyBindingUsage type for use // with apply. diff --git a/pkg/client/applyconfiguration/utils.go b/pkg/client/applyconfiguration/utils.go index 466234e27e3..c5b96b33cf6 100644 --- a/pkg/client/applyconfiguration/utils.go +++ b/pkg/client/applyconfiguration/utils.go @@ -21,10 +21,10 @@ package applyconfiguration import ( v1alpha1 "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" v2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsminiov1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" jobminiov1alpha1 "github.com/minio/operator/pkg/client/applyconfiguration/job.min.io/v1alpha1" miniominiov2 "github.com/minio/operator/pkg/client/applyconfiguration/minio.min.io/v2" - applyconfigurationstsminiov1alpha1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1alpha1" + stsminiov1beta1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -90,17 +90,17 @@ func ForKind(kind schema.GroupVersionKind) interface{} { case v2.SchemeGroupVersion.WithKind("TierUsage"): return &miniominiov2.TierUsageApplyConfiguration{} - // Group=sts.min.io, Version=v1alpha1 - case stsminiov1alpha1.SchemeGroupVersion.WithKind("Application"): - return &applyconfigurationstsminiov1alpha1.ApplicationApplyConfiguration{} - case stsminiov1alpha1.SchemeGroupVersion.WithKind("PolicyBinding"): - return &applyconfigurationstsminiov1alpha1.PolicyBindingApplyConfiguration{} - case stsminiov1alpha1.SchemeGroupVersion.WithKind("PolicyBindingSpec"): - return &applyconfigurationstsminiov1alpha1.PolicyBindingSpecApplyConfiguration{} - case stsminiov1alpha1.SchemeGroupVersion.WithKind("PolicyBindingStatus"): - return &applyconfigurationstsminiov1alpha1.PolicyBindingStatusApplyConfiguration{} - case stsminiov1alpha1.SchemeGroupVersion.WithKind("PolicyBindingUsage"): - return &applyconfigurationstsminiov1alpha1.PolicyBindingUsageApplyConfiguration{} + // Group=sts.min.io, Version=v1beta1 + case v1beta1.SchemeGroupVersion.WithKind("Application"): + return &stsminiov1beta1.ApplicationApplyConfiguration{} + case v1beta1.SchemeGroupVersion.WithKind("PolicyBinding"): + return &stsminiov1beta1.PolicyBindingApplyConfiguration{} + case v1beta1.SchemeGroupVersion.WithKind("PolicyBindingSpec"): + return &stsminiov1beta1.PolicyBindingSpecApplyConfiguration{} + case v1beta1.SchemeGroupVersion.WithKind("PolicyBindingStatus"): + return &stsminiov1beta1.PolicyBindingStatusApplyConfiguration{} + case v1beta1.SchemeGroupVersion.WithKind("PolicyBindingUsage"): + return &stsminiov1beta1.PolicyBindingUsageApplyConfiguration{} } return nil diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 7bd9bdcc99f..4cb27fedc84 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -24,7 +24,7 @@ import ( jobv1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/job.min.io/v1alpha1" miniov2 "github.com/minio/operator/pkg/client/clientset/versioned/typed/minio.min.io/v2" - stsv1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1" + stsv1beta1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -34,7 +34,7 @@ type Interface interface { Discovery() discovery.DiscoveryInterface JobV1alpha1() jobv1alpha1.JobV1alpha1Interface MinioV2() miniov2.MinioV2Interface - StsV1alpha1() stsv1alpha1.StsV1alpha1Interface + StsV1beta1() stsv1beta1.StsV1beta1Interface } // Clientset contains the clients for groups. @@ -42,7 +42,7 @@ type Clientset struct { *discovery.DiscoveryClient jobV1alpha1 *jobv1alpha1.JobV1alpha1Client minioV2 *miniov2.MinioV2Client - stsV1alpha1 *stsv1alpha1.StsV1alpha1Client + stsV1beta1 *stsv1beta1.StsV1beta1Client } // JobV1alpha1 retrieves the JobV1alpha1Client @@ -55,9 +55,9 @@ func (c *Clientset) MinioV2() miniov2.MinioV2Interface { return c.minioV2 } -// StsV1alpha1 retrieves the StsV1alpha1Client -func (c *Clientset) StsV1alpha1() stsv1alpha1.StsV1alpha1Interface { - return c.stsV1alpha1 +// StsV1beta1 retrieves the StsV1beta1Client +func (c *Clientset) StsV1beta1() stsv1beta1.StsV1beta1Interface { + return c.stsV1beta1 } // Discovery retrieves the DiscoveryClient @@ -112,7 +112,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, if err != nil { return nil, err } - cs.stsV1alpha1, err = stsv1alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) + cs.stsV1beta1, err = stsv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func New(c rest.Interface) *Clientset { var cs Clientset cs.jobV1alpha1 = jobv1alpha1.New(c) cs.minioV2 = miniov2.New(c) - cs.stsV1alpha1 = stsv1alpha1.New(c) + cs.stsV1beta1 = stsv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 12d1e469ac5..e567572ed39 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -24,8 +24,8 @@ import ( fakejobv1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/job.min.io/v1alpha1/fake" miniov2 "github.com/minio/operator/pkg/client/clientset/versioned/typed/minio.min.io/v2" fakeminiov2 "github.com/minio/operator/pkg/client/clientset/versioned/typed/minio.min.io/v2/fake" - stsv1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1" - fakestsv1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake" + stsv1beta1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1" + fakestsv1beta1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" @@ -93,7 +93,7 @@ func (c *Clientset) MinioV2() miniov2.MinioV2Interface { return &fakeminiov2.FakeMinioV2{Fake: &c.Fake} } -// StsV1alpha1 retrieves the StsV1alpha1Client -func (c *Clientset) StsV1alpha1() stsv1alpha1.StsV1alpha1Interface { - return &fakestsv1alpha1.FakeStsV1alpha1{Fake: &c.Fake} +// StsV1beta1 retrieves the StsV1beta1Client +func (c *Clientset) StsV1beta1() stsv1beta1.StsV1beta1Interface { + return &fakestsv1beta1.FakeStsV1beta1{Fake: &c.Fake} } diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index f4d3fae6bc9..47de6a5877f 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -21,7 +21,7 @@ package fake import ( jobv1alpha1 "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsv1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + stsv1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -35,7 +35,7 @@ var codecs = serializer.NewCodecFactory(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ jobv1alpha1.AddToScheme, miniov2.AddToScheme, - stsv1alpha1.AddToScheme, + stsv1beta1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 4964b82af62..482a43fce12 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -21,7 +21,7 @@ package scheme import ( jobv1alpha1 "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsv1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + stsv1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -35,7 +35,7 @@ var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ jobv1alpha1.AddToScheme, miniov2.AddToScheme, - stsv1alpha1.AddToScheme, + stsv1beta1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/doc.go similarity index 98% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/doc.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/doc.go index 3b4480b44f7..781d84d233e 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/doc.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/doc.go @@ -17,4 +17,4 @@ // Code generated by client-gen. DO NOT EDIT. // This package has the automatically generated typed clients. -package v1alpha1 +package v1beta1 diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/doc.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/doc.go diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_policybinding.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_policybinding.go similarity index 71% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_policybinding.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_policybinding.go index 8e1d8af1951..77403b65326 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_policybinding.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_policybinding.go @@ -23,8 +23,8 @@ import ( json "encoding/json" "fmt" - v1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" - stsminiov1alpha1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" + stsminiov1beta1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" @@ -34,29 +34,29 @@ import ( // FakePolicyBindings implements PolicyBindingInterface type FakePolicyBindings struct { - Fake *FakeStsV1alpha1 + Fake *FakeStsV1beta1 ns string } -var policybindingsResource = v1alpha1.SchemeGroupVersion.WithResource("policybindings") +var policybindingsResource = v1beta1.SchemeGroupVersion.WithResource("policybindings") -var policybindingsKind = v1alpha1.SchemeGroupVersion.WithKind("PolicyBinding") +var policybindingsKind = v1beta1.SchemeGroupVersion.WithKind("PolicyBinding") // Get takes name of the policyBinding, and returns the corresponding policyBinding object, and an error if there is any. -func (c *FakePolicyBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.PolicyBinding, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(policybindingsResource, c.ns, name), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewGetAction(policybindingsResource, c.ns, name), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // List takes label and field selectors, and returns the list of PolicyBindings that match those selectors. -func (c *FakePolicyBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PolicyBindingList, err error) { +func (c *FakePolicyBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.PolicyBindingList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(policybindingsResource, policybindingsKind, c.ns, opts), &v1alpha1.PolicyBindingList{}) + Invokes(testing.NewListAction(policybindingsResource, policybindingsKind, c.ns, opts), &v1beta1.PolicyBindingList{}) if obj == nil { return nil, err @@ -66,8 +66,8 @@ func (c *FakePolicyBindings) List(ctx context.Context, opts v1.ListOptions) (res if label == nil { label = labels.Everything() } - list := &v1alpha1.PolicyBindingList{ListMeta: obj.(*v1alpha1.PolicyBindingList).ListMeta} - for _, item := range obj.(*v1alpha1.PolicyBindingList).Items { + list := &v1beta1.PolicyBindingList{ListMeta: obj.(*v1beta1.PolicyBindingList).ListMeta} + for _, item := range obj.(*v1beta1.PolicyBindingList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -83,43 +83,43 @@ func (c *FakePolicyBindings) Watch(ctx context.Context, opts v1.ListOptions) (wa } // Create takes the representation of a policyBinding and creates it. Returns the server's representation of the policyBinding, and an error, if there is any. -func (c *FakePolicyBindings) Create(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.CreateOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) Create(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.CreateOptions) (result *v1beta1.PolicyBinding, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(policybindingsResource, c.ns, policyBinding), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewCreateAction(policybindingsResource, c.ns, policyBinding), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // Update takes the representation of a policyBinding and updates it. Returns the server's representation of the policyBinding, and an error, if there is any. -func (c *FakePolicyBindings) Update(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) Update(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (result *v1beta1.PolicyBinding, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(policybindingsResource, c.ns, policyBinding), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewUpdateAction(policybindingsResource, c.ns, policyBinding), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePolicyBindings) UpdateStatus(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (*v1alpha1.PolicyBinding, error) { +func (c *FakePolicyBindings) UpdateStatus(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (*v1beta1.PolicyBinding, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(policybindingsResource, "status", c.ns, policyBinding), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewUpdateSubresourceAction(policybindingsResource, "status", c.ns, policyBinding), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // Delete takes name of the policyBinding and deletes it. Returns an error if one occurs. func (c *FakePolicyBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(policybindingsResource, c.ns, name, opts), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewDeleteActionWithOptions(policybindingsResource, c.ns, name, opts), &v1beta1.PolicyBinding{}) return err } @@ -128,23 +128,23 @@ func (c *FakePolicyBindings) Delete(ctx context.Context, name string, opts v1.De func (c *FakePolicyBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { action := testing.NewDeleteCollectionAction(policybindingsResource, c.ns, listOpts) - _, err := c.Fake.Invokes(action, &v1alpha1.PolicyBindingList{}) + _, err := c.Fake.Invokes(action, &v1beta1.PolicyBindingList{}) return err } // Patch applies the patch and returns the patched policyBinding. -func (c *FakePolicyBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.PolicyBinding, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, name, pt, data, subresources...), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, name, pt, data, subresources...), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // Apply takes the given apply declarative configuration, applies it and returns the applied policyBinding. -func (c *FakePolicyBindings) Apply(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) Apply(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) { if policyBinding == nil { return nil, fmt.Errorf("policyBinding provided to Apply must not be nil") } @@ -157,17 +157,17 @@ func (c *FakePolicyBindings) Apply(ctx context.Context, policyBinding *stsminiov return nil, fmt.Errorf("policyBinding.Name must be provided to Apply") } obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, *name, types.ApplyPatchType, data), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, *name, types.ApplyPatchType, data), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } // ApplyStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakePolicyBindings) ApplyStatus(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *FakePolicyBindings) ApplyStatus(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) { if policyBinding == nil { return nil, fmt.Errorf("policyBinding provided to Apply must not be nil") } @@ -180,10 +180,10 @@ func (c *FakePolicyBindings) ApplyStatus(ctx context.Context, policyBinding *sts return nil, fmt.Errorf("policyBinding.Name must be provided to Apply") } obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, *name, types.ApplyPatchType, data, "status"), &v1alpha1.PolicyBinding{}) + Invokes(testing.NewPatchSubresourceAction(policybindingsResource, c.ns, *name, types.ApplyPatchType, data, "status"), &v1beta1.PolicyBinding{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.PolicyBinding), err + return obj.(*v1beta1.PolicyBinding), err } diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_sts.min.io_client.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_sts.min.io_client.go similarity index 80% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_sts.min.io_client.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_sts.min.io_client.go index 6dfbf04e746..ec5ac3c2fd2 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/fake/fake_sts.min.io_client.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/fake/fake_sts.min.io_client.go @@ -19,22 +19,22 @@ package fake import ( - v1alpha1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeStsV1alpha1 struct { +type FakeStsV1beta1 struct { *testing.Fake } -func (c *FakeStsV1alpha1) PolicyBindings(namespace string) v1alpha1.PolicyBindingInterface { +func (c *FakeStsV1beta1) PolicyBindings(namespace string) v1beta1.PolicyBindingInterface { return &FakePolicyBindings{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStsV1alpha1) RESTClient() rest.Interface { +func (c *FakeStsV1beta1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/generated_expansion.go similarity index 97% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/generated_expansion.go index 7b1409ae353..ec4985dc410 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/generated_expansion.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/generated_expansion.go @@ -16,6 +16,6 @@ // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 type PolicyBindingExpansion interface{} diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/policybinding.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/policybinding.go similarity index 77% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/policybinding.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/policybinding.go index f326bf16f31..10e8deb4276 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/policybinding.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/policybinding.go @@ -16,7 +16,7 @@ // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( "context" @@ -24,8 +24,8 @@ import ( "fmt" "time" - v1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" - stsminiov1alpha1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" + stsminiov1beta1 "github.com/minio/operator/pkg/client/applyconfiguration/sts.min.io/v1beta1" scheme "github.com/minio/operator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -41,17 +41,17 @@ type PolicyBindingsGetter interface { // PolicyBindingInterface has methods to work with PolicyBinding resources. type PolicyBindingInterface interface { - Create(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.CreateOptions) (*v1alpha1.PolicyBinding, error) - Update(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (*v1alpha1.PolicyBinding, error) - UpdateStatus(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (*v1alpha1.PolicyBinding, error) + Create(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.CreateOptions) (*v1beta1.PolicyBinding, error) + Update(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (*v1beta1.PolicyBinding, error) + UpdateStatus(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (*v1beta1.PolicyBinding, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.PolicyBinding, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PolicyBindingList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.PolicyBinding, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta1.PolicyBindingList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PolicyBinding, err error) - Apply(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) - ApplyStatus(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.PolicyBinding, err error) + Apply(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) + ApplyStatus(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) PolicyBindingExpansion } @@ -62,7 +62,7 @@ type policyBindings struct { } // newPolicyBindings returns a PolicyBindings -func newPolicyBindings(c *StsV1alpha1Client, namespace string) *policyBindings { +func newPolicyBindings(c *StsV1beta1Client, namespace string) *policyBindings { return &policyBindings{ client: c.RESTClient(), ns: namespace, @@ -70,8 +70,8 @@ func newPolicyBindings(c *StsV1alpha1Client, namespace string) *policyBindings { } // Get takes name of the policyBinding, and returns the corresponding policyBinding object, and an error if there is any. -func (c *policyBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PolicyBinding, err error) { - result = &v1alpha1.PolicyBinding{} +func (c *policyBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.PolicyBinding, err error) { + result = &v1beta1.PolicyBinding{} err = c.client.Get(). Namespace(c.ns). Resource("policybindings"). @@ -83,12 +83,12 @@ func (c *policyBindings) Get(ctx context.Context, name string, options v1.GetOpt } // List takes label and field selectors, and returns the list of PolicyBindings that match those selectors. -func (c *policyBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PolicyBindingList, err error) { +func (c *policyBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.PolicyBindingList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v1alpha1.PolicyBindingList{} + result = &v1beta1.PolicyBindingList{} err = c.client.Get(). Namespace(c.ns). Resource("policybindings"). @@ -115,8 +115,8 @@ func (c *policyBindings) Watch(ctx context.Context, opts v1.ListOptions) (watch. } // Create takes the representation of a policyBinding and creates it. Returns the server's representation of the policyBinding, and an error, if there is any. -func (c *policyBindings) Create(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.CreateOptions) (result *v1alpha1.PolicyBinding, err error) { - result = &v1alpha1.PolicyBinding{} +func (c *policyBindings) Create(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.CreateOptions) (result *v1beta1.PolicyBinding, err error) { + result = &v1beta1.PolicyBinding{} err = c.client.Post(). Namespace(c.ns). Resource("policybindings"). @@ -128,8 +128,8 @@ func (c *policyBindings) Create(ctx context.Context, policyBinding *v1alpha1.Pol } // Update takes the representation of a policyBinding and updates it. Returns the server's representation of the policyBinding, and an error, if there is any. -func (c *policyBindings) Update(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (result *v1alpha1.PolicyBinding, err error) { - result = &v1alpha1.PolicyBinding{} +func (c *policyBindings) Update(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (result *v1beta1.PolicyBinding, err error) { + result = &v1beta1.PolicyBinding{} err = c.client.Put(). Namespace(c.ns). Resource("policybindings"). @@ -143,8 +143,8 @@ func (c *policyBindings) Update(ctx context.Context, policyBinding *v1alpha1.Pol // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *policyBindings) UpdateStatus(ctx context.Context, policyBinding *v1alpha1.PolicyBinding, opts v1.UpdateOptions) (result *v1alpha1.PolicyBinding, err error) { - result = &v1alpha1.PolicyBinding{} +func (c *policyBindings) UpdateStatus(ctx context.Context, policyBinding *v1beta1.PolicyBinding, opts v1.UpdateOptions) (result *v1beta1.PolicyBinding, err error) { + result = &v1beta1.PolicyBinding{} err = c.client.Put(). Namespace(c.ns). Resource("policybindings"). @@ -185,8 +185,8 @@ func (c *policyBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOpt } // Patch applies the patch and returns the patched policyBinding. -func (c *policyBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PolicyBinding, err error) { - result = &v1alpha1.PolicyBinding{} +func (c *policyBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.PolicyBinding, err error) { + result = &v1beta1.PolicyBinding{} err = c.client.Patch(pt). Namespace(c.ns). Resource("policybindings"). @@ -200,7 +200,7 @@ func (c *policyBindings) Patch(ctx context.Context, name string, pt types.PatchT } // Apply takes the given apply declarative configuration, applies it and returns the applied policyBinding. -func (c *policyBindings) Apply(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *policyBindings) Apply(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) { if policyBinding == nil { return nil, fmt.Errorf("policyBinding provided to Apply must not be nil") } @@ -213,7 +213,7 @@ func (c *policyBindings) Apply(ctx context.Context, policyBinding *stsminiov1alp if name == nil { return nil, fmt.Errorf("policyBinding.Name must be provided to Apply") } - result = &v1alpha1.PolicyBinding{} + result = &v1beta1.PolicyBinding{} err = c.client.Patch(types.ApplyPatchType). Namespace(c.ns). Resource("policybindings"). @@ -227,7 +227,7 @@ func (c *policyBindings) Apply(ctx context.Context, policyBinding *stsminiov1alp // ApplyStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *policyBindings) ApplyStatus(ctx context.Context, policyBinding *stsminiov1alpha1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PolicyBinding, err error) { +func (c *policyBindings) ApplyStatus(ctx context.Context, policyBinding *stsminiov1beta1.PolicyBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.PolicyBinding, err error) { if policyBinding == nil { return nil, fmt.Errorf("policyBinding provided to Apply must not be nil") } @@ -242,7 +242,7 @@ func (c *policyBindings) ApplyStatus(ctx context.Context, policyBinding *stsmini return nil, fmt.Errorf("policyBinding.Name must be provided to Apply") } - result = &v1alpha1.PolicyBinding{} + result = &v1beta1.PolicyBinding{} err = c.client.Patch(types.ApplyPatchType). Namespace(c.ns). Resource("policybindings"). diff --git a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/sts.min.io_client.go b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/sts.min.io_client.go similarity index 69% rename from pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/sts.min.io_client.go rename to pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/sts.min.io_client.go index 413dde10f54..96bc9d28435 100644 --- a/pkg/client/clientset/versioned/typed/sts.min.io/v1alpha1/sts.min.io_client.go +++ b/pkg/client/clientset/versioned/typed/sts.min.io/v1beta1/sts.min.io_client.go @@ -16,34 +16,34 @@ // Code generated by client-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( "net/http" - v1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" "github.com/minio/operator/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type StsV1alpha1Interface interface { +type StsV1beta1Interface interface { RESTClient() rest.Interface PolicyBindingsGetter } -// StsV1alpha1Client is used to interact with features provided by the sts.min.io group. -type StsV1alpha1Client struct { +// StsV1beta1Client is used to interact with features provided by the sts.min.io group. +type StsV1beta1Client struct { restClient rest.Interface } -func (c *StsV1alpha1Client) PolicyBindings(namespace string) PolicyBindingInterface { +func (c *StsV1beta1Client) PolicyBindings(namespace string) PolicyBindingInterface { return newPolicyBindings(c, namespace) } -// NewForConfig creates a new StsV1alpha1Client for the given config. +// NewForConfig creates a new StsV1beta1Client for the given config. // NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), // where httpClient was generated with rest.HTTPClientFor(c). -func NewForConfig(c *rest.Config) (*StsV1alpha1Client, error) { +func NewForConfig(c *rest.Config) (*StsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -55,9 +55,9 @@ func NewForConfig(c *rest.Config) (*StsV1alpha1Client, error) { return NewForConfigAndClient(&config, httpClient) } -// NewForConfigAndClient creates a new StsV1alpha1Client for the given config and http client. +// NewForConfigAndClient creates a new StsV1beta1Client for the given config and http client. // Note the http client provided takes precedence over the configured transport values. -func NewForConfigAndClient(c *rest.Config, h *http.Client) (*StsV1alpha1Client, error) { +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*StsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -66,12 +66,12 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*StsV1alpha1Client, if err != nil { return nil, err } - return &StsV1alpha1Client{client}, nil + return &StsV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new StsV1alpha1Client for the given config and +// NewForConfigOrDie creates a new StsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *StsV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *StsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -79,13 +79,13 @@ func NewForConfigOrDie(c *rest.Config) *StsV1alpha1Client { return client } -// New creates a new StsV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *StsV1alpha1Client { - return &StsV1alpha1Client{c} +// New creates a new StsV1beta1Client for the given RESTClient. +func New(c rest.Interface) *StsV1beta1Client { + return &StsV1beta1Client{c} } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := v1beta1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() @@ -99,7 +99,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StsV1alpha1Client) RESTClient() rest.Interface { +func (c *StsV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 6ef90962506..4cd679d8a8b 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -23,7 +23,7 @@ import ( v1alpha1 "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" v2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsminiov1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) @@ -62,9 +62,9 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case v2.SchemeGroupVersion.WithResource("tenants"): return &genericInformer{resource: resource.GroupResource(), informer: f.Minio().V2().Tenants().Informer()}, nil - // Group=sts.min.io, Version=v1alpha1 - case stsminiov1alpha1.SchemeGroupVersion.WithResource("policybindings"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Sts().V1alpha1().PolicyBindings().Informer()}, nil + // Group=sts.min.io, Version=v1beta1 + case v1beta1.SchemeGroupVersion.WithResource("policybindings"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Sts().V1beta1().PolicyBindings().Informer()}, nil } diff --git a/pkg/client/informers/externalversions/sts.min.io/interface.go b/pkg/client/informers/externalversions/sts.min.io/interface.go index b0c331dcafe..dba3ff0ab4b 100644 --- a/pkg/client/informers/externalversions/sts.min.io/interface.go +++ b/pkg/client/informers/externalversions/sts.min.io/interface.go @@ -20,13 +20,13 @@ package sts import ( internalinterfaces "github.com/minio/operator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/minio/operator/pkg/client/informers/externalversions/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/client/informers/externalversions/sts.min.io/v1beta1" ) // Interface provides access to each of this group's versions. type Interface interface { - // V1alpha1 provides access to shared informers for resources in V1alpha1. - V1alpha1() v1alpha1.Interface + // V1beta1 provides access to shared informers for resources in V1beta1. + V1beta1() v1beta1.Interface } type group struct { @@ -40,7 +40,7 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } -// V1alpha1 returns a new v1alpha1.Interface. -func (g *group) V1alpha1() v1alpha1.Interface { - return v1alpha1.New(g.factory, g.namespace, g.tweakListOptions) +// V1beta1 returns a new v1beta1.Interface. +func (g *group) V1beta1() v1beta1.Interface { + return v1beta1.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/client/informers/externalversions/sts.min.io/v1alpha1/interface.go b/pkg/client/informers/externalversions/sts.min.io/v1beta1/interface.go similarity index 99% rename from pkg/client/informers/externalversions/sts.min.io/v1alpha1/interface.go rename to pkg/client/informers/externalversions/sts.min.io/v1beta1/interface.go index c74e9874ed5..2821235feb5 100644 --- a/pkg/client/informers/externalversions/sts.min.io/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/sts.min.io/v1beta1/interface.go @@ -16,7 +16,7 @@ // Code generated by informer-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( internalinterfaces "github.com/minio/operator/pkg/client/informers/externalversions/internalinterfaces" diff --git a/pkg/client/informers/externalversions/sts.min.io/v1alpha1/policybinding.go b/pkg/client/informers/externalversions/sts.min.io/v1beta1/policybinding.go similarity index 84% rename from pkg/client/informers/externalversions/sts.min.io/v1alpha1/policybinding.go rename to pkg/client/informers/externalversions/sts.min.io/v1beta1/policybinding.go index 98ac7245c28..0172e7c1645 100644 --- a/pkg/client/informers/externalversions/sts.min.io/v1alpha1/policybinding.go +++ b/pkg/client/informers/externalversions/sts.min.io/v1beta1/policybinding.go @@ -16,16 +16,16 @@ // Code generated by informer-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( "context" time "time" - stsminiov1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + stsminiov1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" versioned "github.com/minio/operator/pkg/client/clientset/versioned" internalinterfaces "github.com/minio/operator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/minio/operator/pkg/client/listers/sts.min.io/v1alpha1" + v1beta1 "github.com/minio/operator/pkg/client/listers/sts.min.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -36,7 +36,7 @@ import ( // PolicyBindings. type PolicyBindingInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.PolicyBindingLister + Lister() v1beta1.PolicyBindingLister } type policyBindingInformer struct { @@ -62,16 +62,16 @@ func NewFilteredPolicyBindingInformer(client versioned.Interface, namespace stri if tweakListOptions != nil { tweakListOptions(&options) } - return client.StsV1alpha1().PolicyBindings(namespace).List(context.TODO(), options) + return client.StsV1beta1().PolicyBindings(namespace).List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.StsV1alpha1().PolicyBindings(namespace).Watch(context.TODO(), options) + return client.StsV1beta1().PolicyBindings(namespace).Watch(context.TODO(), options) }, }, - &stsminiov1alpha1.PolicyBinding{}, + &stsminiov1beta1.PolicyBinding{}, resyncPeriod, indexers, ) @@ -82,9 +82,9 @@ func (f *policyBindingInformer) defaultInformer(client versioned.Interface, resy } func (f *policyBindingInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&stsminiov1alpha1.PolicyBinding{}, f.defaultInformer) + return f.factory.InformerFor(&stsminiov1beta1.PolicyBinding{}, f.defaultInformer) } -func (f *policyBindingInformer) Lister() v1alpha1.PolicyBindingLister { - return v1alpha1.NewPolicyBindingLister(f.Informer().GetIndexer()) +func (f *policyBindingInformer) Lister() v1beta1.PolicyBindingLister { + return v1beta1.NewPolicyBindingLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/listers/sts.min.io/v1alpha1/policybinding.go b/pkg/client/listers/sts.min.io/v1alpha1/policybinding.go index 934dc42cd2b..0190c3d3d6c 100644 --- a/pkg/client/listers/sts.min.io/v1alpha1/policybinding.go +++ b/pkg/client/listers/sts.min.io/v1alpha1/policybinding.go @@ -19,7 +19,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + v1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/sts.min.io/v1beta1/expansion_generated.go b/pkg/client/listers/sts.min.io/v1beta1/expansion_generated.go new file mode 100644 index 00000000000..7d149cbdfcd --- /dev/null +++ b/pkg/client/listers/sts.min.io/v1beta1/expansion_generated.go @@ -0,0 +1,27 @@ +// This file is part of MinIO Operator +// Copyright (c) 2023 MinIO, Inc. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +// Code generated by lister-gen. DO NOT EDIT. + +package v1beta1 + +// PolicyBindingListerExpansion allows custom methods to be added to +// PolicyBindingLister. +type PolicyBindingListerExpansion interface{} + +// PolicyBindingNamespaceListerExpansion allows custom methods to be added to +// PolicyBindingNamespaceLister. +type PolicyBindingNamespaceListerExpansion interface{} diff --git a/pkg/client/listers/sts.min.io/v1beta1/policybinding.go b/pkg/client/listers/sts.min.io/v1beta1/policybinding.go new file mode 100644 index 00000000000..baede6f1287 --- /dev/null +++ b/pkg/client/listers/sts.min.io/v1beta1/policybinding.go @@ -0,0 +1,99 @@ +// This file is part of MinIO Operator +// Copyright (c) 2023 MinIO, Inc. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +// Code generated by lister-gen. DO NOT EDIT. + +package v1beta1 + +import ( + v1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// PolicyBindingLister helps list PolicyBindings. +// All objects returned here must be treated as read-only. +type PolicyBindingLister interface { + // List lists all PolicyBindings in the indexer. + // Objects returned here must be treated as read-only. + List(selector labels.Selector) (ret []*v1beta1.PolicyBinding, err error) + // PolicyBindings returns an object that can list and get PolicyBindings. + PolicyBindings(namespace string) PolicyBindingNamespaceLister + PolicyBindingListerExpansion +} + +// policyBindingLister implements the PolicyBindingLister interface. +type policyBindingLister struct { + indexer cache.Indexer +} + +// NewPolicyBindingLister returns a new PolicyBindingLister. +func NewPolicyBindingLister(indexer cache.Indexer) PolicyBindingLister { + return &policyBindingLister{indexer: indexer} +} + +// List lists all PolicyBindings in the indexer. +func (s *policyBindingLister) List(selector labels.Selector) (ret []*v1beta1.PolicyBinding, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1beta1.PolicyBinding)) + }) + return ret, err +} + +// PolicyBindings returns an object that can list and get PolicyBindings. +func (s *policyBindingLister) PolicyBindings(namespace string) PolicyBindingNamespaceLister { + return policyBindingNamespaceLister{indexer: s.indexer, namespace: namespace} +} + +// PolicyBindingNamespaceLister helps list and get PolicyBindings. +// All objects returned here must be treated as read-only. +type PolicyBindingNamespaceLister interface { + // List lists all PolicyBindings in the indexer for a given namespace. + // Objects returned here must be treated as read-only. + List(selector labels.Selector) (ret []*v1beta1.PolicyBinding, err error) + // Get retrieves the PolicyBinding from the indexer for a given namespace and name. + // Objects returned here must be treated as read-only. + Get(name string) (*v1beta1.PolicyBinding, error) + PolicyBindingNamespaceListerExpansion +} + +// policyBindingNamespaceLister implements the PolicyBindingNamespaceLister +// interface. +type policyBindingNamespaceLister struct { + indexer cache.Indexer + namespace string +} + +// List lists all PolicyBindings in the indexer for a given namespace. +func (s policyBindingNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.PolicyBinding, err error) { + err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { + ret = append(ret, m.(*v1beta1.PolicyBinding)) + }) + return ret, err +} + +// Get retrieves the PolicyBinding from the indexer for a given namespace and name. +func (s policyBindingNamespaceLister) Get(name string) (*v1beta1.PolicyBinding, error) { + obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1beta1.Resource("policybinding"), name) + } + return obj.(*v1beta1.PolicyBinding), nil +} diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 40f92b2379f..a71d85d96f2 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -36,7 +36,7 @@ import ( "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" v2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsv1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + stsv1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" clientset "github.com/minio/operator/pkg/client/clientset/versioned" informers "github.com/minio/operator/pkg/client/informers/externalversions" promclientset "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" @@ -76,7 +76,7 @@ func init() { func StartOperator(kubeconfig string) { _ = v2.AddToScheme(scheme.Scheme) _ = v1alpha1.AddToScheme(scheme.Scheme) - _ = stsv1alpha1.AddToScheme(scheme.Scheme) + _ = stsv1beta1.AddToScheme(scheme.Scheme) klog.Info("Starting MinIO Operator") // set up signals, so we handle the first shutdown signal gracefully stopCh := setupSignalHandler() @@ -164,7 +164,7 @@ func StartOperator(kubeconfig string) { kubeInformerFactory.Apps().V1().Deployments(), kubeInformerFactory.Core().V1().Pods(), minioInformerFactory.Minio().V2().Tenants(), - minioInformerFactory.Sts().V1alpha1().PolicyBindings(), + minioInformerFactory.Sts().V1beta1().PolicyBindings(), kubeInformerFactory.Core().V1().Services(), hostsTemplate, pkg.Version, diff --git a/pkg/controller/job-controller.go b/pkg/controller/job-controller.go index 1b66f84d8a5..624be58a374 100644 --- a/pkg/controller/job-controller.go +++ b/pkg/controller/job-controller.go @@ -26,7 +26,7 @@ import ( "github.com/minio/minio-go/v7/pkg/set" "github.com/minio/operator/pkg/apis/job.min.io/v1alpha1" miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" - stsv1alpha1 "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + stsv1beta1 "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" jobinformers "github.com/minio/operator/pkg/client/informers/externalversions/job.min.io/v1alpha1" joblisters "github.com/minio/operator/pkg/client/listers/job.min.io/v1alpha1" "github.com/minio/operator/pkg/utils/miniojob" @@ -241,7 +241,7 @@ func (c *JobController) SyncHandler(key string) (Result, error) { return WrapResult(Result{RequeueAfter: time.Second * 5}, nil) } // check sa - pbs := &stsv1alpha1.PolicyBindingList{} + pbs := &stsv1beta1.PolicyBindingList{} err = c.k8sClient.List(ctx, pbs, client.InNamespace(namespace)) if err != nil { return WrapResult(Result{}, err) diff --git a/pkg/controller/main-controller.go b/pkg/controller/main-controller.go index 5502a7321f4..bdeab2f0ebf 100644 --- a/pkg/controller/main-controller.go +++ b/pkg/controller/main-controller.go @@ -76,7 +76,7 @@ import ( minioscheme "github.com/minio/operator/pkg/client/clientset/versioned/scheme" jobinformers "github.com/minio/operator/pkg/client/informers/externalversions/job.min.io/v1alpha1" informers "github.com/minio/operator/pkg/client/informers/externalversions/minio.min.io/v2" - stsInformers "github.com/minio/operator/pkg/client/informers/externalversions/sts.min.io/v1alpha1" + stsInformers "github.com/minio/operator/pkg/client/informers/externalversions/sts.min.io/v1beta1" "github.com/minio/operator/pkg/resources/statefulsets" ) diff --git a/pkg/controller/sts_handlers.go b/pkg/controller/sts_handlers.go index 505864ca6c0..388c848ecb6 100644 --- a/pkg/controller/sts_handlers.go +++ b/pkg/controller/sts_handlers.go @@ -30,7 +30,7 @@ import ( "github.com/minio/operator/pkg/common" - "github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1" + "github.com/minio/operator/pkg/apis/sts.min.io/v1beta1" iampolicy "github.com/minio/pkg/iam/policy" "github.com/gorilla/mux" @@ -132,8 +132,8 @@ func (c *Controller) AssumeRoleWithWebIdentityHandler(w http.ResponseWriter, r * saName := chunks[1] // Authorized PolicyBindings for the Service Account - policyBindings := []v1alpha1.PolicyBinding{} - pbs, err := c.minioClientSet.StsV1alpha1().PolicyBindings(tenantNamespace).List(ctx, metav1.ListOptions{}) + policyBindings := []v1beta1.PolicyBinding{} + pbs, err := c.minioClientSet.StsV1beta1().PolicyBindings(tenantNamespace).List(ctx, metav1.ListOptions{}) if err != nil { writeSTSErrorResponse(w, true, ErrSTSInternalError, fmt.Errorf("Error obtaining PolicyBindings: %s", err)) return diff --git a/release.sh b/release.sh index 453d2692983..cc5eded865b 100755 --- a/release.sh +++ b/release.sh @@ -55,7 +55,7 @@ done annotations_files=( "pkg/apis/job.min.io/v1alpha1/types.go" "pkg/apis/minio.min.io/v2/types.go" - "pkg/apis/sts.min.io/v1alpha1/types.go" + "pkg/apis/sts.min.io/v1beta1/types.go" ) for file in "${annotations_files[@]}"; do diff --git a/resources/base/crds/sts.min.io_policybindings.yaml b/resources/base/crds/sts.min.io_policybindings.yaml index a2bc9a8aca4..a0890d6b8e3 100644 --- a/resources/base/crds/sts.min.io_policybindings.yaml +++ b/resources/base/crds/sts.min.io_policybindings.yaml @@ -24,7 +24,7 @@ spec: - jsonPath: .metadata.creationTimestamp name: Age type: date - name: v1alpha1 + name: v1beta1 schema: openAPIV3Schema: properties: