From 13372a43e6aa1cca5100f38c2c65080f65a02fad Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Wed, 19 May 2021 11:39:53 -0500 Subject: [PATCH] Update generated code from previous commit. --- ...cierge.pinniped.dev_credentialissuers.yaml | 22 +++++-------------- generated/1.17/README.adoc | 8 +++---- .../config/v1alpha1/types_credentialissuer.go | 16 +++++--------- .../config/v1alpha1/zz_generated.deepcopy.go | 6 ++++- ...cierge.pinniped.dev_credentialissuers.yaml | 22 +++++-------------- generated/1.18/README.adoc | 8 +++---- .../config/v1alpha1/types_credentialissuer.go | 16 +++++--------- .../config/v1alpha1/zz_generated.deepcopy.go | 6 ++++- ...cierge.pinniped.dev_credentialissuers.yaml | 22 +++++-------------- generated/1.19/README.adoc | 8 +++---- .../config/v1alpha1/types_credentialissuer.go | 16 +++++--------- .../config/v1alpha1/zz_generated.deepcopy.go | 6 ++++- ...cierge.pinniped.dev_credentialissuers.yaml | 22 +++++-------------- generated/1.20/README.adoc | 8 +++---- .../config/v1alpha1/types_credentialissuer.go | 16 +++++--------- .../config/v1alpha1/zz_generated.deepcopy.go | 6 ++++- ...cierge.pinniped.dev_credentialissuers.yaml | 22 +++++-------------- .../config/v1alpha1/types_credentialissuer.go | 16 +++++--------- .../config/v1alpha1/zz_generated.deepcopy.go | 6 ++++- 19 files changed, 96 insertions(+), 156 deletions(-) diff --git a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml index 60ffaee3..7b94b098 100644 --- a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml @@ -37,31 +37,20 @@ spec: metadata: type: object spec: - default: - impersonationProxy: - mode: disabled - service: - type: LoadBalancer description: Spec describes the intended configuration of the Concierge. properties: impersonationProxy: - default: - mode: disabled - service: - type: LoadBalancer description: ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. properties: externalEndpoint: description: "ExternalEndpoint describes the HTTPS endpoint where - the proxy will be exposed. If the proxy is enabled and this - field is not set, a Service of type LoadBalancer will be automatically - provisioned and its external name will be advertised. \n Setting - this field disables the automatic creation of this LoadBalancer - Service." + the proxy will be exposed. If not set, the proxy will be served + using the external name of the LoadBalancer service or the cluster + service DNS name. \n This field must be non-empty when spec.impersonationProxy.service.mode + is \"None\"." type: string mode: - default: disabled description: 'Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the @@ -75,7 +64,8 @@ spec: service: default: type: LoadBalancer - description: Service describes the configuraiton + description: Service describes the configuration of the Service + provisioned to expose the impersonation proxy to clients. properties: annotations: additionalProperties: diff --git a/generated/1.17/README.adoc b/generated/1.17/README.adoc index 955e4920..a356bea7 100644 --- a/generated/1.17/README.adoc +++ b/generated/1.17/README.adoc @@ -398,7 +398,7 @@ ImpersonationProxyServiceSpec describes how the Concierge should provision a Ser [id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-concierge-config-v1alpha1-impersonationproxyspec"] ==== ImpersonationProxySpec -ImpersonationProxySpec describes the intended configuration of the Concierge impersonation proxy. + .Appears In: **** @@ -409,9 +409,9 @@ ImpersonationProxySpec describes the intended configuration of the Concierge imp |=== | Field | Description | *`mode`* __ImpersonationProxyMode__ | Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the impersonation proxy. - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. -| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuraiton -| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be advertised. - Setting this field disables the automatic creation of this LoadBalancer Service. +| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. +| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will be served using the external name of the LoadBalancer service or the cluster service DNS name. + This field must be non-empty when spec.impersonationProxy.service.mode is "None". |=== diff --git a/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go index c102c1a8..60edeccc 100644 --- a/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -45,9 +45,7 @@ const ( // CredentialIssuerSpec describes the intended configuration of the Concierge. type CredentialIssuerSpec struct { // ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. - // - //+kubebuilder:default:={"mode": "disabled", "service": {"type": "LoadBalancer"}} - ImpersonationProxy ImpersonationProxySpec `json:"impersonationProxy"` + ImpersonationProxy *ImpersonationProxySpec `json:"impersonationProxy"` } // ImpersonationProxyMode enumerates the configuration modes for the impersonation proxy. @@ -88,20 +86,17 @@ type ImpersonationProxySpec struct { // - "disabled" explicitly disables the impersonation proxy. This is the default. // - "enabled" explicitly enables the impersonation proxy. // - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. - // - // +kubebuilder:default:="disabled" Mode ImpersonationProxyMode `json:"mode"` - // Service describes the configuraiton + // Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. // // +kubebuilder:default:={"type": "LoadBalancer"} Service ImpersonationProxyServiceSpec `json:"service"` - // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this - // field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be - // advertised. + // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will + // be served using the external name of the LoadBalancer service or the cluster service DNS name. // - // Setting this field disables the automatic creation of this LoadBalancer Service. + // This field must be non-empty when spec.impersonationProxy.service.mode is "None". // // +optional ExternalEndpoint string `json:"externalEndpoint,omitempty"` @@ -228,7 +223,6 @@ type CredentialIssuer struct { // Spec describes the intended configuration of the Concierge. // // +optional - // +kubebuilder:default:={"impersonationProxy": {"mode": "disabled", "service": {"type": "LoadBalancer"}}} Spec CredentialIssuerSpec `json:"spec"` // CredentialIssuerStatus describes the status of the Concierge. diff --git a/generated/1.17/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.17/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index d5b38b36..cf679b2c 100644 --- a/generated/1.17/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.17/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -117,7 +117,11 @@ func (in *CredentialIssuerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerSpec) DeepCopyInto(out *CredentialIssuerSpec) { *out = *in - in.ImpersonationProxy.DeepCopyInto(&out.ImpersonationProxy) + if in.ImpersonationProxy != nil { + in, out := &in.ImpersonationProxy, &out.ImpersonationProxy + *out = new(ImpersonationProxySpec) + (*in).DeepCopyInto(*out) + } return } diff --git a/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml index 60ffaee3..7b94b098 100644 --- a/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -37,31 +37,20 @@ spec: metadata: type: object spec: - default: - impersonationProxy: - mode: disabled - service: - type: LoadBalancer description: Spec describes the intended configuration of the Concierge. properties: impersonationProxy: - default: - mode: disabled - service: - type: LoadBalancer description: ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. properties: externalEndpoint: description: "ExternalEndpoint describes the HTTPS endpoint where - the proxy will be exposed. If the proxy is enabled and this - field is not set, a Service of type LoadBalancer will be automatically - provisioned and its external name will be advertised. \n Setting - this field disables the automatic creation of this LoadBalancer - Service." + the proxy will be exposed. If not set, the proxy will be served + using the external name of the LoadBalancer service or the cluster + service DNS name. \n This field must be non-empty when spec.impersonationProxy.service.mode + is \"None\"." type: string mode: - default: disabled description: 'Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the @@ -75,7 +64,8 @@ spec: service: default: type: LoadBalancer - description: Service describes the configuraiton + description: Service describes the configuration of the Service + provisioned to expose the impersonation proxy to clients. properties: annotations: additionalProperties: diff --git a/generated/1.18/README.adoc b/generated/1.18/README.adoc index 6163e1ed..d98c17d8 100644 --- a/generated/1.18/README.adoc +++ b/generated/1.18/README.adoc @@ -398,7 +398,7 @@ ImpersonationProxyServiceSpec describes how the Concierge should provision a Ser [id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-concierge-config-v1alpha1-impersonationproxyspec"] ==== ImpersonationProxySpec -ImpersonationProxySpec describes the intended configuration of the Concierge impersonation proxy. + .Appears In: **** @@ -409,9 +409,9 @@ ImpersonationProxySpec describes the intended configuration of the Concierge imp |=== | Field | Description | *`mode`* __ImpersonationProxyMode__ | Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the impersonation proxy. - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. -| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuraiton -| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be advertised. - Setting this field disables the automatic creation of this LoadBalancer Service. +| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. +| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will be served using the external name of the LoadBalancer service or the cluster service DNS name. + This field must be non-empty when spec.impersonationProxy.service.mode is "None". |=== diff --git a/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go index c102c1a8..60edeccc 100644 --- a/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -45,9 +45,7 @@ const ( // CredentialIssuerSpec describes the intended configuration of the Concierge. type CredentialIssuerSpec struct { // ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. - // - //+kubebuilder:default:={"mode": "disabled", "service": {"type": "LoadBalancer"}} - ImpersonationProxy ImpersonationProxySpec `json:"impersonationProxy"` + ImpersonationProxy *ImpersonationProxySpec `json:"impersonationProxy"` } // ImpersonationProxyMode enumerates the configuration modes for the impersonation proxy. @@ -88,20 +86,17 @@ type ImpersonationProxySpec struct { // - "disabled" explicitly disables the impersonation proxy. This is the default. // - "enabled" explicitly enables the impersonation proxy. // - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. - // - // +kubebuilder:default:="disabled" Mode ImpersonationProxyMode `json:"mode"` - // Service describes the configuraiton + // Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. // // +kubebuilder:default:={"type": "LoadBalancer"} Service ImpersonationProxyServiceSpec `json:"service"` - // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this - // field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be - // advertised. + // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will + // be served using the external name of the LoadBalancer service or the cluster service DNS name. // - // Setting this field disables the automatic creation of this LoadBalancer Service. + // This field must be non-empty when spec.impersonationProxy.service.mode is "None". // // +optional ExternalEndpoint string `json:"externalEndpoint,omitempty"` @@ -228,7 +223,6 @@ type CredentialIssuer struct { // Spec describes the intended configuration of the Concierge. // // +optional - // +kubebuilder:default:={"impersonationProxy": {"mode": "disabled", "service": {"type": "LoadBalancer"}}} Spec CredentialIssuerSpec `json:"spec"` // CredentialIssuerStatus describes the status of the Concierge. diff --git a/generated/1.18/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.18/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index d5b38b36..cf679b2c 100644 --- a/generated/1.18/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.18/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -117,7 +117,11 @@ func (in *CredentialIssuerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerSpec) DeepCopyInto(out *CredentialIssuerSpec) { *out = *in - in.ImpersonationProxy.DeepCopyInto(&out.ImpersonationProxy) + if in.ImpersonationProxy != nil { + in, out := &in.ImpersonationProxy, &out.ImpersonationProxy + *out = new(ImpersonationProxySpec) + (*in).DeepCopyInto(*out) + } return } diff --git a/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml index 60ffaee3..7b94b098 100644 --- a/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -37,31 +37,20 @@ spec: metadata: type: object spec: - default: - impersonationProxy: - mode: disabled - service: - type: LoadBalancer description: Spec describes the intended configuration of the Concierge. properties: impersonationProxy: - default: - mode: disabled - service: - type: LoadBalancer description: ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. properties: externalEndpoint: description: "ExternalEndpoint describes the HTTPS endpoint where - the proxy will be exposed. If the proxy is enabled and this - field is not set, a Service of type LoadBalancer will be automatically - provisioned and its external name will be advertised. \n Setting - this field disables the automatic creation of this LoadBalancer - Service." + the proxy will be exposed. If not set, the proxy will be served + using the external name of the LoadBalancer service or the cluster + service DNS name. \n This field must be non-empty when spec.impersonationProxy.service.mode + is \"None\"." type: string mode: - default: disabled description: 'Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the @@ -75,7 +64,8 @@ spec: service: default: type: LoadBalancer - description: Service describes the configuraiton + description: Service describes the configuration of the Service + provisioned to expose the impersonation proxy to clients. properties: annotations: additionalProperties: diff --git a/generated/1.19/README.adoc b/generated/1.19/README.adoc index db74e17f..4ced2c7c 100644 --- a/generated/1.19/README.adoc +++ b/generated/1.19/README.adoc @@ -398,7 +398,7 @@ ImpersonationProxyServiceSpec describes how the Concierge should provision a Ser [id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-concierge-config-v1alpha1-impersonationproxyspec"] ==== ImpersonationProxySpec -ImpersonationProxySpec describes the intended configuration of the Concierge impersonation proxy. + .Appears In: **** @@ -409,9 +409,9 @@ ImpersonationProxySpec describes the intended configuration of the Concierge imp |=== | Field | Description | *`mode`* __ImpersonationProxyMode__ | Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the impersonation proxy. - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. -| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuraiton -| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be advertised. - Setting this field disables the automatic creation of this LoadBalancer Service. +| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. +| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will be served using the external name of the LoadBalancer service or the cluster service DNS name. + This field must be non-empty when spec.impersonationProxy.service.mode is "None". |=== diff --git a/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go index c102c1a8..60edeccc 100644 --- a/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -45,9 +45,7 @@ const ( // CredentialIssuerSpec describes the intended configuration of the Concierge. type CredentialIssuerSpec struct { // ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. - // - //+kubebuilder:default:={"mode": "disabled", "service": {"type": "LoadBalancer"}} - ImpersonationProxy ImpersonationProxySpec `json:"impersonationProxy"` + ImpersonationProxy *ImpersonationProxySpec `json:"impersonationProxy"` } // ImpersonationProxyMode enumerates the configuration modes for the impersonation proxy. @@ -88,20 +86,17 @@ type ImpersonationProxySpec struct { // - "disabled" explicitly disables the impersonation proxy. This is the default. // - "enabled" explicitly enables the impersonation proxy. // - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. - // - // +kubebuilder:default:="disabled" Mode ImpersonationProxyMode `json:"mode"` - // Service describes the configuraiton + // Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. // // +kubebuilder:default:={"type": "LoadBalancer"} Service ImpersonationProxyServiceSpec `json:"service"` - // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this - // field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be - // advertised. + // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will + // be served using the external name of the LoadBalancer service or the cluster service DNS name. // - // Setting this field disables the automatic creation of this LoadBalancer Service. + // This field must be non-empty when spec.impersonationProxy.service.mode is "None". // // +optional ExternalEndpoint string `json:"externalEndpoint,omitempty"` @@ -228,7 +223,6 @@ type CredentialIssuer struct { // Spec describes the intended configuration of the Concierge. // // +optional - // +kubebuilder:default:={"impersonationProxy": {"mode": "disabled", "service": {"type": "LoadBalancer"}}} Spec CredentialIssuerSpec `json:"spec"` // CredentialIssuerStatus describes the status of the Concierge. diff --git a/generated/1.19/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.19/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index d5b38b36..cf679b2c 100644 --- a/generated/1.19/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.19/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -117,7 +117,11 @@ func (in *CredentialIssuerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerSpec) DeepCopyInto(out *CredentialIssuerSpec) { *out = *in - in.ImpersonationProxy.DeepCopyInto(&out.ImpersonationProxy) + if in.ImpersonationProxy != nil { + in, out := &in.ImpersonationProxy, &out.ImpersonationProxy + *out = new(ImpersonationProxySpec) + (*in).DeepCopyInto(*out) + } return } diff --git a/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml index 60ffaee3..7b94b098 100644 --- a/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -37,31 +37,20 @@ spec: metadata: type: object spec: - default: - impersonationProxy: - mode: disabled - service: - type: LoadBalancer description: Spec describes the intended configuration of the Concierge. properties: impersonationProxy: - default: - mode: disabled - service: - type: LoadBalancer description: ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. properties: externalEndpoint: description: "ExternalEndpoint describes the HTTPS endpoint where - the proxy will be exposed. If the proxy is enabled and this - field is not set, a Service of type LoadBalancer will be automatically - provisioned and its external name will be advertised. \n Setting - this field disables the automatic creation of this LoadBalancer - Service." + the proxy will be exposed. If not set, the proxy will be served + using the external name of the LoadBalancer service or the cluster + service DNS name. \n This field must be non-empty when spec.impersonationProxy.service.mode + is \"None\"." type: string mode: - default: disabled description: 'Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the @@ -75,7 +64,8 @@ spec: service: default: type: LoadBalancer - description: Service describes the configuraiton + description: Service describes the configuration of the Service + provisioned to expose the impersonation proxy to clients. properties: annotations: additionalProperties: diff --git a/generated/1.20/README.adoc b/generated/1.20/README.adoc index 3a71b4ad..fa0f22f9 100644 --- a/generated/1.20/README.adoc +++ b/generated/1.20/README.adoc @@ -398,7 +398,7 @@ ImpersonationProxyServiceSpec describes how the Concierge should provision a Ser [id="{anchor_prefix}-go-pinniped-dev-generated-1-20-apis-concierge-config-v1alpha1-impersonationproxyspec"] ==== ImpersonationProxySpec -ImpersonationProxySpec describes the intended configuration of the Concierge impersonation proxy. + .Appears In: **** @@ -409,9 +409,9 @@ ImpersonationProxySpec describes the intended configuration of the Concierge imp |=== | Field | Description | *`mode`* __ImpersonationProxyMode__ | Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the impersonation proxy. - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. -| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-20-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuraiton -| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be advertised. - Setting this field disables the automatic creation of this LoadBalancer Service. +| *`service`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-20-apis-concierge-config-v1alpha1-impersonationproxyservicespec[$$ImpersonationProxyServiceSpec$$]__ | Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. +| *`externalEndpoint`* __string__ | ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will be served using the external name of the LoadBalancer service or the cluster service DNS name. + This field must be non-empty when spec.impersonationProxy.service.mode is "None". |=== diff --git a/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go index c102c1a8..60edeccc 100644 --- a/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -45,9 +45,7 @@ const ( // CredentialIssuerSpec describes the intended configuration of the Concierge. type CredentialIssuerSpec struct { // ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. - // - //+kubebuilder:default:={"mode": "disabled", "service": {"type": "LoadBalancer"}} - ImpersonationProxy ImpersonationProxySpec `json:"impersonationProxy"` + ImpersonationProxy *ImpersonationProxySpec `json:"impersonationProxy"` } // ImpersonationProxyMode enumerates the configuration modes for the impersonation proxy. @@ -88,20 +86,17 @@ type ImpersonationProxySpec struct { // - "disabled" explicitly disables the impersonation proxy. This is the default. // - "enabled" explicitly enables the impersonation proxy. // - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. - // - // +kubebuilder:default:="disabled" Mode ImpersonationProxyMode `json:"mode"` - // Service describes the configuraiton + // Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. // // +kubebuilder:default:={"type": "LoadBalancer"} Service ImpersonationProxyServiceSpec `json:"service"` - // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this - // field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be - // advertised. + // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will + // be served using the external name of the LoadBalancer service or the cluster service DNS name. // - // Setting this field disables the automatic creation of this LoadBalancer Service. + // This field must be non-empty when spec.impersonationProxy.service.mode is "None". // // +optional ExternalEndpoint string `json:"externalEndpoint,omitempty"` @@ -228,7 +223,6 @@ type CredentialIssuer struct { // Spec describes the intended configuration of the Concierge. // // +optional - // +kubebuilder:default:={"impersonationProxy": {"mode": "disabled", "service": {"type": "LoadBalancer"}}} Spec CredentialIssuerSpec `json:"spec"` // CredentialIssuerStatus describes the status of the Concierge. diff --git a/generated/1.20/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.20/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index d5b38b36..cf679b2c 100644 --- a/generated/1.20/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.20/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -117,7 +117,11 @@ func (in *CredentialIssuerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerSpec) DeepCopyInto(out *CredentialIssuerSpec) { *out = *in - in.ImpersonationProxy.DeepCopyInto(&out.ImpersonationProxy) + if in.ImpersonationProxy != nil { + in, out := &in.ImpersonationProxy, &out.ImpersonationProxy + *out = new(ImpersonationProxySpec) + (*in).DeepCopyInto(*out) + } return } diff --git a/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml index 60ffaee3..7b94b098 100644 --- a/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -37,31 +37,20 @@ spec: metadata: type: object spec: - default: - impersonationProxy: - mode: disabled - service: - type: LoadBalancer description: Spec describes the intended configuration of the Concierge. properties: impersonationProxy: - default: - mode: disabled - service: - type: LoadBalancer description: ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. properties: externalEndpoint: description: "ExternalEndpoint describes the HTTPS endpoint where - the proxy will be exposed. If the proxy is enabled and this - field is not set, a Service of type LoadBalancer will be automatically - provisioned and its external name will be advertised. \n Setting - this field disables the automatic creation of this LoadBalancer - Service." + the proxy will be exposed. If not set, the proxy will be served + using the external name of the LoadBalancer service or the cluster + service DNS name. \n This field must be non-empty when spec.impersonationProxy.service.mode + is \"None\"." type: string mode: - default: disabled description: 'Mode configures whether the impersonation proxy should be started: - "disabled" explicitly disables the impersonation proxy. This is the default. - "enabled" explicitly enables the @@ -75,7 +64,8 @@ spec: service: default: type: LoadBalancer - description: Service describes the configuraiton + description: Service describes the configuration of the Service + provisioned to expose the impersonation proxy to clients. properties: annotations: additionalProperties: diff --git a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go index c102c1a8..60edeccc 100644 --- a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -45,9 +45,7 @@ const ( // CredentialIssuerSpec describes the intended configuration of the Concierge. type CredentialIssuerSpec struct { // ImpersonationProxy describes the intended configuration of the Concierge impersonation proxy. - // - //+kubebuilder:default:={"mode": "disabled", "service": {"type": "LoadBalancer"}} - ImpersonationProxy ImpersonationProxySpec `json:"impersonationProxy"` + ImpersonationProxy *ImpersonationProxySpec `json:"impersonationProxy"` } // ImpersonationProxyMode enumerates the configuration modes for the impersonation proxy. @@ -88,20 +86,17 @@ type ImpersonationProxySpec struct { // - "disabled" explicitly disables the impersonation proxy. This is the default. // - "enabled" explicitly enables the impersonation proxy. // - "auto" enables or disables the impersonation proxy based upon the cluster in which it is running. - // - // +kubebuilder:default:="disabled" Mode ImpersonationProxyMode `json:"mode"` - // Service describes the configuraiton + // Service describes the configuration of the Service provisioned to expose the impersonation proxy to clients. // // +kubebuilder:default:={"type": "LoadBalancer"} Service ImpersonationProxyServiceSpec `json:"service"` - // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If the proxy is enabled and this - // field is not set, a Service of type LoadBalancer will be automatically provisioned and its external name will be - // advertised. + // ExternalEndpoint describes the HTTPS endpoint where the proxy will be exposed. If not set, the proxy will + // be served using the external name of the LoadBalancer service or the cluster service DNS name. // - // Setting this field disables the automatic creation of this LoadBalancer Service. + // This field must be non-empty when spec.impersonationProxy.service.mode is "None". // // +optional ExternalEndpoint string `json:"externalEndpoint,omitempty"` @@ -228,7 +223,6 @@ type CredentialIssuer struct { // Spec describes the intended configuration of the Concierge. // // +optional - // +kubebuilder:default:={"impersonationProxy": {"mode": "disabled", "service": {"type": "LoadBalancer"}}} Spec CredentialIssuerSpec `json:"spec"` // CredentialIssuerStatus describes the status of the Concierge. diff --git a/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index d5b38b36..cf679b2c 100644 --- a/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -117,7 +117,11 @@ func (in *CredentialIssuerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerSpec) DeepCopyInto(out *CredentialIssuerSpec) { *out = *in - in.ImpersonationProxy.DeepCopyInto(&out.ImpersonationProxy) + if in.ImpersonationProxy != nil { + in, out := &in.ImpersonationProxy, &out.ImpersonationProxy + *out = new(ImpersonationProxySpec) + (*in).DeepCopyInto(*out) + } return }