From 0f48bf1db885c14bda16fe76a5898a9fe37cf853 Mon Sep 17 00:00:00 2001 From: Cesar Celis Hernandez Date: Tue, 21 Nov 2023 12:59:39 -0500 Subject: [PATCH] Prepare for the addition of new CRD (#1863) * Prepare for the addition of new CRD * Updates to CRD's generation scripts * Bump code-generator to v0.28.4 * Add grants for needed bash scripts * execute `make regen-crd` and `make-regen-crd-docs`. * `go mod tidy` all the things Signed-off-by: pjuarezd --------- Signed-off-by: pjuarezd --- docs/tenant_crd.adoc | 14 +- go.mod | 4 +- go.sum | 8 +- k8s/update-codegen.sh | 1 + kubectl-minio/go.mod | 2 +- kubectl-minio/go.sum | 4 +- .../minio.min.io/v2/zz_generated.deepcopy.go | 24 +++ .../minio.min.io/v2/auditconfig.go | 39 ---- .../minio.min.io/v2/logconfig.go | 175 ---------------- .../minio.min.io/v2/logdbconfig.go | 175 ---------------- .../minio.min.io/v2/pool.go | 9 + .../minio.min.io/v2/prometheusconfig.go | 193 ------------------ .../minio.min.io/v2/s3features.go | 39 ---- .../minio.min.io/v2/sidecars.go | 9 + .../minio.min.io/v2/tenantspec.go | 33 +++ pkg/client/clientset/versioned/doc.go | 20 -- .../informers/externalversions/factory.go | 4 +- 17 files changed, 99 insertions(+), 654 deletions(-) delete mode 100644 pkg/client/applyconfiguration/minio.min.io/v2/auditconfig.go delete mode 100644 pkg/client/applyconfiguration/minio.min.io/v2/logconfig.go delete mode 100644 pkg/client/applyconfiguration/minio.min.io/v2/logdbconfig.go delete mode 100644 pkg/client/applyconfiguration/minio.min.io/v2/prometheusconfig.go delete mode 100644 pkg/client/applyconfiguration/minio.min.io/v2/s3features.go delete mode 100644 pkg/client/clientset/versioned/doc.go diff --git a/docs/tenant_crd.adoc b/docs/tenant_crd.adoc index e8964b95f6e..05f0a7d00d4 100644 --- a/docs/tenant_crd.adoc +++ b/docs/tenant_crd.adoc @@ -101,6 +101,16 @@ CertificateStatus keeps track of all the certificates managed by the operator |=== +[id="{anchor_prefix}-github-com-minio-operator-pkg-apis-minio-min-io-v2-customcertificateconfig"] +==== CustomCertificateConfig + +CustomCertificateConfig (`customCertificateConfig`) provides attributes associated of the TLS certificates manually added to the Operator as part of tenant creation. These fields contain no data if there are no custom TLS certificates. + +.Appears In: +**** +- xref:{anchor_prefix}-github-com-minio-operator-pkg-apis-minio-min-io-v2-customcertificates[$$CustomCertificates$$] +**** + [id="{anchor_prefix}-github-com-minio-operator-pkg-apis-minio-min-io-v2-customcertificates"] @@ -255,11 +265,11 @@ KESConfig (`kes`) defines the configuration of the https://github.com/minio/kes[ |*`gcpCredentialSecretName`* __string__ |*Optional* + - Specify the GCP default credentials to be used for KES to authenticate to GCP key store + Specify the GCP default credentials to be used for KES to authenticate to GCP key store |*`gcpWorkloadIdentityPool`* __string__ |*Optional* + - Specify the name of the workload identity pool (This is required for generating service account token) + Specify the name of the workload identity pool (This is required for generating service account token) |*`annotations`* __object (keys:string, values:string)__ |*Optional* + diff --git a/go.mod b/go.mod index 14ef66b9351..acd697b71c9 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( k8s.io/api v0.28.1 k8s.io/apimachinery v0.28.1 k8s.io/client-go v0.28.1 - k8s.io/code-generator v0.28.0 + k8s.io/code-generator v0.28.4 k8s.io/klog/v2 v2.100.1 k8s.io/kubectl v0.25.4 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 @@ -184,7 +184,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect google.golang.org/grpc v1.56.3 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/h2non/filetype.v1 v1.0.5 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index f70f6fca3f0..c89d9538e1d 100644 --- a/go.sum +++ b/go.sum @@ -1466,8 +1466,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1517,8 +1517,8 @@ k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= -k8s.io/code-generator v0.28.0 h1:msdkRVJNVFgdiIJ8REl/d3cZsMB9HByFcWMmn13NyuE= -k8s.io/code-generator v0.28.0/go.mod h1:ueeSJZJ61NHBa0ccWLey6mwawum25vX61nRZ6WOzN9A= +k8s.io/code-generator v0.28.4 h1:tcOSNIZQvuAvXhOwpbuJkKbAABJQeyCcQBCN/3uI18c= +k8s.io/code-generator v0.28.4/go.mod h1:OQAfl6bZikQ/tK6faJ18Vyzo54rUII2NmjurHyiN1g4= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= diff --git a/k8s/update-codegen.sh b/k8s/update-codegen.sh index 3845bbb97b9..c6ee7d8af43 100755 --- a/k8s/update-codegen.sh +++ b/k8s/update-codegen.sh @@ -34,6 +34,7 @@ echo ">> Temporary output directory ${TEMP_DIR}" # Ensure we can execute. chmod +x ${CODEGEN_PKG}/generate-groups.sh +chmod +x ${CODEGEN_PKG}/generate-internal-groups.sh # generate the code with: # --output-base because this script should also be able to run inside the vendor dir of diff --git a/kubectl-minio/go.mod b/kubectl-minio/go.mod index 8b10e9712d1..f016032acac 100644 --- a/kubectl-minio/go.mod +++ b/kubectl-minio/go.mod @@ -97,7 +97,7 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.9.3 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/kubectl-minio/go.sum b/kubectl-minio/go.sum index 3e7cba03566..476b2f5d494 100644 --- a/kubectl-minio/go.sum +++ b/kubectl-minio/go.sum @@ -366,8 +366,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go b/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go index a5d0b57007a..2ae6c7c869b 100644 --- a/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go +++ b/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go @@ -407,6 +407,11 @@ func (in *Pool) DeepCopyInto(out *Pool) { *out = new(string) **out = **in } + if in.ReclaimStorage != nil { + in, out := &in.ReclaimStorage, &out.ReclaimStorage + *out = new(bool) + **out = **in + } return } @@ -504,6 +509,11 @@ func (in *SideCars) DeepCopyInto(out *SideCars) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = new(v1.ResourceRequirements) + (*in).DeepCopyInto(*out) + } return } @@ -760,6 +770,20 @@ func (in *TenantSpec) DeepCopyInto(out *TenantSpec) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.AdditionalVolumes != nil { + in, out := &in.AdditionalVolumes, &out.AdditionalVolumes + *out = make([]v1.Volume, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.AdditionalVolumeMounts != nil { + in, out := &in.AdditionalVolumeMounts, &out.AdditionalVolumeMounts + *out = make([]v1.VolumeMount, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } return } diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/auditconfig.go b/pkg/client/applyconfiguration/minio.min.io/v2/auditconfig.go deleted file mode 100644 index afe9ac04d50..00000000000 --- a/pkg/client/applyconfiguration/minio.min.io/v2/auditconfig.go +++ /dev/null @@ -1,39 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 applyconfiguration-gen. DO NOT EDIT. - -package v2 - -// AuditConfigApplyConfiguration represents an declarative configuration of the AuditConfig type for use -// with apply. -type AuditConfigApplyConfiguration struct { - DiskCapacityGB *int `json:"diskCapacityGB,omitempty"` -} - -// AuditConfigApplyConfiguration constructs an declarative configuration of the AuditConfig type for use with -// apply. -func AuditConfig() *AuditConfigApplyConfiguration { - return &AuditConfigApplyConfiguration{} -} - -// WithDiskCapacityGB sets the DiskCapacityGB field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the DiskCapacityGB field is set to the value of the last call. -func (b *AuditConfigApplyConfiguration) WithDiskCapacityGB(value int) *AuditConfigApplyConfiguration { - b.DiskCapacityGB = &value - return b -} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/logconfig.go b/pkg/client/applyconfiguration/minio.min.io/v2/logconfig.go deleted file mode 100644 index 2023c2cf100..00000000000 --- a/pkg/client/applyconfiguration/minio.min.io/v2/logconfig.go +++ /dev/null @@ -1,175 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 applyconfiguration-gen. DO NOT EDIT. - -package v2 - -import ( - v1 "k8s.io/api/core/v1" -) - -// LogConfigApplyConfiguration represents an declarative configuration of the LogConfig type for use -// with apply. -type LogConfigApplyConfiguration struct { - Image *string `json:"image,omitempty"` - Resources *v1.ResourceRequirements `json:"resources,omitempty"` - NodeSelector map[string]string `json:"nodeSelector,omitempty"` - Affinity *v1.Affinity `json:"affinity,omitempty"` - Tolerations []v1.Toleration `json:"tolerations,omitempty"` - TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Db *LogDbConfigApplyConfiguration `json:"db,omitempty"` - Audit *AuditConfigApplyConfiguration `json:"audit,omitempty"` - SecurityContext *v1.PodSecurityContext `json:"securityContext,omitempty"` - ServiceAccountName *string `json:"serviceAccountName,omitempty"` - Env []v1.EnvVar `json:"env,omitempty"` -} - -// LogConfigApplyConfiguration constructs an declarative configuration of the LogConfig type for use with -// apply. -func LogConfig() *LogConfigApplyConfiguration { - return &LogConfigApplyConfiguration{} -} - -// WithImage sets the Image field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Image field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithImage(value string) *LogConfigApplyConfiguration { - b.Image = &value - return b -} - -// WithResources sets the Resources field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Resources field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithResources(value v1.ResourceRequirements) *LogConfigApplyConfiguration { - b.Resources = &value - return b -} - -// WithNodeSelector puts the entries into the NodeSelector field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the NodeSelector field, -// overwriting an existing map entries in NodeSelector field with the same key. -func (b *LogConfigApplyConfiguration) WithNodeSelector(entries map[string]string) *LogConfigApplyConfiguration { - if b.NodeSelector == nil && len(entries) > 0 { - b.NodeSelector = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.NodeSelector[k] = v - } - return b -} - -// WithAffinity sets the Affinity field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Affinity field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithAffinity(value v1.Affinity) *LogConfigApplyConfiguration { - b.Affinity = &value - return b -} - -// WithTolerations adds the given value to the Tolerations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Tolerations field. -func (b *LogConfigApplyConfiguration) WithTolerations(values ...v1.Toleration) *LogConfigApplyConfiguration { - for i := range values { - b.Tolerations = append(b.Tolerations, values[i]) - } - return b -} - -// WithTopologySpreadConstraints adds the given value to the TopologySpreadConstraints field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the TopologySpreadConstraints field. -func (b *LogConfigApplyConfiguration) WithTopologySpreadConstraints(values ...v1.TopologySpreadConstraint) *LogConfigApplyConfiguration { - for i := range values { - b.TopologySpreadConstraints = append(b.TopologySpreadConstraints, values[i]) - } - return b -} - -// WithAnnotations puts the entries into the Annotations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Annotations field, -// overwriting an existing map entries in Annotations field with the same key. -func (b *LogConfigApplyConfiguration) WithAnnotations(entries map[string]string) *LogConfigApplyConfiguration { - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Annotations[k] = v - } - return b -} - -// WithLabels puts the entries into the Labels field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Labels field, -// overwriting an existing map entries in Labels field with the same key. -func (b *LogConfigApplyConfiguration) WithLabels(entries map[string]string) *LogConfigApplyConfiguration { - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Labels[k] = v - } - return b -} - -// WithDb sets the Db field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Db field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithDb(value *LogDbConfigApplyConfiguration) *LogConfigApplyConfiguration { - b.Db = value - return b -} - -// WithAudit sets the Audit field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Audit field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithAudit(value *AuditConfigApplyConfiguration) *LogConfigApplyConfiguration { - b.Audit = value - return b -} - -// WithSecurityContext sets the SecurityContext field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the SecurityContext field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithSecurityContext(value v1.PodSecurityContext) *LogConfigApplyConfiguration { - b.SecurityContext = &value - return b -} - -// WithServiceAccountName sets the ServiceAccountName field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the ServiceAccountName field is set to the value of the last call. -func (b *LogConfigApplyConfiguration) WithServiceAccountName(value string) *LogConfigApplyConfiguration { - b.ServiceAccountName = &value - return b -} - -// WithEnv adds the given value to the Env field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Env field. -func (b *LogConfigApplyConfiguration) WithEnv(values ...v1.EnvVar) *LogConfigApplyConfiguration { - for i := range values { - b.Env = append(b.Env, values[i]) - } - return b -} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/logdbconfig.go b/pkg/client/applyconfiguration/minio.min.io/v2/logdbconfig.go deleted file mode 100644 index d9dcab9629b..00000000000 --- a/pkg/client/applyconfiguration/minio.min.io/v2/logdbconfig.go +++ /dev/null @@ -1,175 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 applyconfiguration-gen. DO NOT EDIT. - -package v2 - -import ( - v1 "k8s.io/api/core/v1" -) - -// LogDbConfigApplyConfiguration represents an declarative configuration of the LogDbConfig type for use -// with apply. -type LogDbConfigApplyConfiguration struct { - Image *string `json:"image,omitempty"` - InitImage *string `json:"initimage,omitempty"` - VolumeClaimTemplate *v1.PersistentVolumeClaim `json:"volumeClaimTemplate,omitempty"` - Resources *v1.ResourceRequirements `json:"resources,omitempty"` - NodeSelector map[string]string `json:"nodeSelector,omitempty"` - Affinity *v1.Affinity `json:"affinity,omitempty"` - Tolerations []v1.Toleration `json:"tolerations,omitempty"` - TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - SecurityContext *v1.PodSecurityContext `json:"securityContext,omitempty"` - ServiceAccountName *string `json:"serviceAccountName,omitempty"` - Env []v1.EnvVar `json:"env,omitempty"` -} - -// LogDbConfigApplyConfiguration constructs an declarative configuration of the LogDbConfig type for use with -// apply. -func LogDbConfig() *LogDbConfigApplyConfiguration { - return &LogDbConfigApplyConfiguration{} -} - -// WithImage sets the Image field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Image field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithImage(value string) *LogDbConfigApplyConfiguration { - b.Image = &value - return b -} - -// WithInitImage sets the InitImage field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the InitImage field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithInitImage(value string) *LogDbConfigApplyConfiguration { - b.InitImage = &value - return b -} - -// WithVolumeClaimTemplate sets the VolumeClaimTemplate field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the VolumeClaimTemplate field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithVolumeClaimTemplate(value v1.PersistentVolumeClaim) *LogDbConfigApplyConfiguration { - b.VolumeClaimTemplate = &value - return b -} - -// WithResources sets the Resources field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Resources field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithResources(value v1.ResourceRequirements) *LogDbConfigApplyConfiguration { - b.Resources = &value - return b -} - -// WithNodeSelector puts the entries into the NodeSelector field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the NodeSelector field, -// overwriting an existing map entries in NodeSelector field with the same key. -func (b *LogDbConfigApplyConfiguration) WithNodeSelector(entries map[string]string) *LogDbConfigApplyConfiguration { - if b.NodeSelector == nil && len(entries) > 0 { - b.NodeSelector = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.NodeSelector[k] = v - } - return b -} - -// WithAffinity sets the Affinity field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Affinity field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithAffinity(value v1.Affinity) *LogDbConfigApplyConfiguration { - b.Affinity = &value - return b -} - -// WithTolerations adds the given value to the Tolerations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Tolerations field. -func (b *LogDbConfigApplyConfiguration) WithTolerations(values ...v1.Toleration) *LogDbConfigApplyConfiguration { - for i := range values { - b.Tolerations = append(b.Tolerations, values[i]) - } - return b -} - -// WithTopologySpreadConstraints adds the given value to the TopologySpreadConstraints field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the TopologySpreadConstraints field. -func (b *LogDbConfigApplyConfiguration) WithTopologySpreadConstraints(values ...v1.TopologySpreadConstraint) *LogDbConfigApplyConfiguration { - for i := range values { - b.TopologySpreadConstraints = append(b.TopologySpreadConstraints, values[i]) - } - return b -} - -// WithAnnotations puts the entries into the Annotations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Annotations field, -// overwriting an existing map entries in Annotations field with the same key. -func (b *LogDbConfigApplyConfiguration) WithAnnotations(entries map[string]string) *LogDbConfigApplyConfiguration { - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Annotations[k] = v - } - return b -} - -// WithLabels puts the entries into the Labels field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Labels field, -// overwriting an existing map entries in Labels field with the same key. -func (b *LogDbConfigApplyConfiguration) WithLabels(entries map[string]string) *LogDbConfigApplyConfiguration { - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Labels[k] = v - } - return b -} - -// WithSecurityContext sets the SecurityContext field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the SecurityContext field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithSecurityContext(value v1.PodSecurityContext) *LogDbConfigApplyConfiguration { - b.SecurityContext = &value - return b -} - -// WithServiceAccountName sets the ServiceAccountName field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the ServiceAccountName field is set to the value of the last call. -func (b *LogDbConfigApplyConfiguration) WithServiceAccountName(value string) *LogDbConfigApplyConfiguration { - b.ServiceAccountName = &value - return b -} - -// WithEnv adds the given value to the Env field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Env field. -func (b *LogDbConfigApplyConfiguration) WithEnv(values ...v1.EnvVar) *LogDbConfigApplyConfiguration { - for i := range values { - b.Env = append(b.Env, values[i]) - } - return b -} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/pool.go b/pkg/client/applyconfiguration/minio.min.io/v2/pool.go index b8cf99b462f..cf3cd156fc2 100644 --- a/pkg/client/applyconfiguration/minio.min.io/v2/pool.go +++ b/pkg/client/applyconfiguration/minio.min.io/v2/pool.go @@ -39,6 +39,7 @@ type PoolApplyConfiguration struct { Annotations map[string]string `json:"annotations,omitempty"` Labels map[string]string `json:"labels,omitempty"` RuntimeClassName *string `json:"runtimeClassName,omitempty"` + ReclaimStorage *bool `json:"reclaimStorage,omitempty"` } // PoolApplyConfiguration constructs an declarative configuration of the Pool type for use with @@ -180,3 +181,11 @@ func (b *PoolApplyConfiguration) WithRuntimeClassName(value string) *PoolApplyCo b.RuntimeClassName = &value return b } + +// WithReclaimStorage sets the ReclaimStorage field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the ReclaimStorage field is set to the value of the last call. +func (b *PoolApplyConfiguration) WithReclaimStorage(value bool) *PoolApplyConfiguration { + b.ReclaimStorage = &value + return b +} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/prometheusconfig.go b/pkg/client/applyconfiguration/minio.min.io/v2/prometheusconfig.go deleted file mode 100644 index dc116d079b5..00000000000 --- a/pkg/client/applyconfiguration/minio.min.io/v2/prometheusconfig.go +++ /dev/null @@ -1,193 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 applyconfiguration-gen. DO NOT EDIT. - -package v2 - -import ( - v1 "k8s.io/api/core/v1" -) - -// PrometheusConfigApplyConfiguration represents an declarative configuration of the PrometheusConfig type for use -// with apply. -type PrometheusConfigApplyConfiguration struct { - Image *string `json:"image,omitempty"` - SideCarImage *string `json:"sidecarimage,omitempty"` - InitImage *string `json:"initimage,omitempty"` - DiskCapacityDB *int `json:"diskCapacityGB,omitempty"` - StorageClassName *string `json:"storageClassName,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - NodeSelector map[string]string `json:"nodeSelector,omitempty"` - Affinity *v1.Affinity `json:"affinity,omitempty"` - Tolerations []v1.Toleration `json:"tolerations,omitempty"` - TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` - Resources *v1.ResourceRequirements `json:"resources,omitempty"` - SecurityContext *v1.PodSecurityContext `json:"securityContext,omitempty"` - ServiceAccountName *string `json:"serviceAccountName,omitempty"` - Env []v1.EnvVar `json:"env,omitempty"` -} - -// PrometheusConfigApplyConfiguration constructs an declarative configuration of the PrometheusConfig type for use with -// apply. -func PrometheusConfig() *PrometheusConfigApplyConfiguration { - return &PrometheusConfigApplyConfiguration{} -} - -// WithImage sets the Image field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Image field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithImage(value string) *PrometheusConfigApplyConfiguration { - b.Image = &value - return b -} - -// WithSideCarImage sets the SideCarImage field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the SideCarImage field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithSideCarImage(value string) *PrometheusConfigApplyConfiguration { - b.SideCarImage = &value - return b -} - -// WithInitImage sets the InitImage field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the InitImage field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithInitImage(value string) *PrometheusConfigApplyConfiguration { - b.InitImage = &value - return b -} - -// WithDiskCapacityDB sets the DiskCapacityDB field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the DiskCapacityDB field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithDiskCapacityDB(value int) *PrometheusConfigApplyConfiguration { - b.DiskCapacityDB = &value - return b -} - -// WithStorageClassName sets the StorageClassName field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the StorageClassName field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithStorageClassName(value string) *PrometheusConfigApplyConfiguration { - b.StorageClassName = &value - return b -} - -// WithAnnotations puts the entries into the Annotations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Annotations field, -// overwriting an existing map entries in Annotations field with the same key. -func (b *PrometheusConfigApplyConfiguration) WithAnnotations(entries map[string]string) *PrometheusConfigApplyConfiguration { - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Annotations[k] = v - } - return b -} - -// WithLabels puts the entries into the Labels field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the Labels field, -// overwriting an existing map entries in Labels field with the same key. -func (b *PrometheusConfigApplyConfiguration) WithLabels(entries map[string]string) *PrometheusConfigApplyConfiguration { - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.Labels[k] = v - } - return b -} - -// WithNodeSelector puts the entries into the NodeSelector field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, the entries provided by each call will be put on the NodeSelector field, -// overwriting an existing map entries in NodeSelector field with the same key. -func (b *PrometheusConfigApplyConfiguration) WithNodeSelector(entries map[string]string) *PrometheusConfigApplyConfiguration { - if b.NodeSelector == nil && len(entries) > 0 { - b.NodeSelector = make(map[string]string, len(entries)) - } - for k, v := range entries { - b.NodeSelector[k] = v - } - return b -} - -// WithAffinity sets the Affinity field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Affinity field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithAffinity(value v1.Affinity) *PrometheusConfigApplyConfiguration { - b.Affinity = &value - return b -} - -// WithTolerations adds the given value to the Tolerations field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Tolerations field. -func (b *PrometheusConfigApplyConfiguration) WithTolerations(values ...v1.Toleration) *PrometheusConfigApplyConfiguration { - for i := range values { - b.Tolerations = append(b.Tolerations, values[i]) - } - return b -} - -// WithTopologySpreadConstraints adds the given value to the TopologySpreadConstraints field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the TopologySpreadConstraints field. -func (b *PrometheusConfigApplyConfiguration) WithTopologySpreadConstraints(values ...v1.TopologySpreadConstraint) *PrometheusConfigApplyConfiguration { - for i := range values { - b.TopologySpreadConstraints = append(b.TopologySpreadConstraints, values[i]) - } - return b -} - -// WithResources sets the Resources field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Resources field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithResources(value v1.ResourceRequirements) *PrometheusConfigApplyConfiguration { - b.Resources = &value - return b -} - -// WithSecurityContext sets the SecurityContext field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the SecurityContext field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithSecurityContext(value v1.PodSecurityContext) *PrometheusConfigApplyConfiguration { - b.SecurityContext = &value - return b -} - -// WithServiceAccountName sets the ServiceAccountName field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the ServiceAccountName field is set to the value of the last call. -func (b *PrometheusConfigApplyConfiguration) WithServiceAccountName(value string) *PrometheusConfigApplyConfiguration { - b.ServiceAccountName = &value - return b -} - -// WithEnv adds the given value to the Env field in the declarative configuration -// and returns the receiver, so that objects can be build by chaining "With" function invocations. -// If called multiple times, values provided by each call will be appended to the Env field. -func (b *PrometheusConfigApplyConfiguration) WithEnv(values ...v1.EnvVar) *PrometheusConfigApplyConfiguration { - for i := range values { - b.Env = append(b.Env, values[i]) - } - return b -} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/s3features.go b/pkg/client/applyconfiguration/minio.min.io/v2/s3features.go deleted file mode 100644 index 5490c642ae2..00000000000 --- a/pkg/client/applyconfiguration/minio.min.io/v2/s3features.go +++ /dev/null @@ -1,39 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 applyconfiguration-gen. DO NOT EDIT. - -package v2 - -// S3FeaturesApplyConfiguration represents an declarative configuration of the S3Features type for use -// with apply. -type S3FeaturesApplyConfiguration struct { - BucketDNS *bool `json:"bucketDNS,omitempty"` -} - -// S3FeaturesApplyConfiguration constructs an declarative configuration of the S3Features type for use with -// apply. -func S3Features() *S3FeaturesApplyConfiguration { - return &S3FeaturesApplyConfiguration{} -} - -// WithBucketDNS sets the BucketDNS field in the declarative configuration to the given value -// and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the BucketDNS field is set to the value of the last call. -func (b *S3FeaturesApplyConfiguration) WithBucketDNS(value bool) *S3FeaturesApplyConfiguration { - b.BucketDNS = &value - return b -} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/sidecars.go b/pkg/client/applyconfiguration/minio.min.io/v2/sidecars.go index 2dedd201dd1..24f3964046d 100644 --- a/pkg/client/applyconfiguration/minio.min.io/v2/sidecars.go +++ b/pkg/client/applyconfiguration/minio.min.io/v2/sidecars.go @@ -28,6 +28,7 @@ type SideCarsApplyConfiguration struct { Containers []v1.Container `json:"containers,omitempty"` VolumeClaimTemplates []v1.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"` Volumes []v1.Volume `json:"volumes,omitempty"` + Resources *v1.ResourceRequirements `json:"resources,omitempty"` } // SideCarsApplyConfiguration constructs an declarative configuration of the SideCars type for use with @@ -65,3 +66,11 @@ func (b *SideCarsApplyConfiguration) WithVolumes(values ...v1.Volume) *SideCarsA } return b } + +// WithResources sets the Resources field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Resources field is set to the value of the last call. +func (b *SideCarsApplyConfiguration) WithResources(value v1.ResourceRequirements) *SideCarsApplyConfiguration { + b.Resources = &value + return b +} diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go b/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go index 8f36eef2b3e..f749879cdb3 100644 --- a/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go +++ b/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go @@ -57,6 +57,9 @@ type TenantSpecApplyConfiguration struct { Buckets []BucketApplyConfiguration `json:"buckets,omitempty"` Logging *LoggingApplyConfiguration `json:"logging,omitempty"` Configuration *v1.LocalObjectReference `json:"configuration,omitempty"` + InitContainers []v1.Container `json:"initContainers,omitempty"` + AdditionalVolumes []v1.Volume `json:"additionalVolumes,omitempty"` + AdditionalVolumeMounts []v1.VolumeMount `json:"additionalVolumeMounts,omitempty"` } // TenantSpecApplyConfiguration constructs an declarative configuration of the TenantSpec type for use with @@ -336,3 +339,33 @@ func (b *TenantSpecApplyConfiguration) WithConfiguration(value v1.LocalObjectRef b.Configuration = &value return b } + +// WithInitContainers adds the given value to the InitContainers field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, values provided by each call will be appended to the InitContainers field. +func (b *TenantSpecApplyConfiguration) WithInitContainers(values ...v1.Container) *TenantSpecApplyConfiguration { + for i := range values { + b.InitContainers = append(b.InitContainers, values[i]) + } + return b +} + +// WithAdditionalVolumes adds the given value to the AdditionalVolumes field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, values provided by each call will be appended to the AdditionalVolumes field. +func (b *TenantSpecApplyConfiguration) WithAdditionalVolumes(values ...v1.Volume) *TenantSpecApplyConfiguration { + for i := range values { + b.AdditionalVolumes = append(b.AdditionalVolumes, values[i]) + } + return b +} + +// WithAdditionalVolumeMounts adds the given value to the AdditionalVolumeMounts field in the declarative configuration +// and returns the receiver, so that objects can be build by chaining "With" function invocations. +// If called multiple times, values provided by each call will be appended to the AdditionalVolumeMounts field. +func (b *TenantSpecApplyConfiguration) WithAdditionalVolumeMounts(values ...v1.VolumeMount) *TenantSpecApplyConfiguration { + for i := range values { + b.AdditionalVolumeMounts = append(b.AdditionalVolumeMounts, values[i]) + } + return b +} diff --git a/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go deleted file mode 100644 index 316f16da0d9..00000000000 --- a/pkg/client/clientset/versioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -// This file is part of MinIO Operator -// Copyright (c) 2021 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 client-gen. DO NOT EDIT. - -// This package has the automatically generated clientset. -package versioned diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 2263a2b8c6b..5c4d0dfabc3 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -167,7 +167,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[ref return res } -// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// InformerFor returns the SharedIndexInformer for obj using an internal // client. func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { f.lock.Lock() @@ -240,7 +240,7 @@ type SharedInformerFactory interface { // ForResource gives generic access to a shared informer of the matching type. ForResource(resource schema.GroupVersionResource) (GenericInformer, error) - // InternalInformerFor returns the SharedIndexInformer for obj using an internal + // InformerFor returns the SharedIndexInformer for obj using an internal // client. InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer