diff --git a/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl b/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl index de976f5c1..7f80f5178 100644 --- a/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl +++ b/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/cmd/pinniped/cmd/kubeconfig.go b/cmd/pinniped/cmd/kubeconfig.go index 8e536983c..1386873d0 100644 --- a/cmd/pinniped/cmd/kubeconfig.go +++ b/cmd/pinniped/cmd/kubeconfig.go @@ -540,26 +540,15 @@ func getConciergeFrontend(credentialIssuer *conciergeconfigv1alpha1.CredentialIs continue } - // Backfill the .status.strategies[].frontend field from .status.kubeConfigInfo for backwards compatibility. - if strategy.Type == conciergeconfigv1alpha1.KubeClusterSigningCertificateStrategyType && strategy.Frontend == nil && credentialIssuer.Status.KubeConfigInfo != nil { - strategy = *strategy.DeepCopy() - strategy.Frontend = &conciergeconfigv1alpha1.CredentialIssuerFrontend{ - Type: conciergeconfigv1alpha1.TokenCredentialRequestAPIFrontendType, - TokenCredentialRequestAPIInfo: &conciergeconfigv1alpha1.TokenCredentialRequestAPIInfo{ - Server: credentialIssuer.Status.KubeConfigInfo.Server, - CertificateAuthorityData: credentialIssuer.Status.KubeConfigInfo.CertificateAuthorityData, - }, - } - } - - // If the strategy frontend is still nil, skip. + // If the strategy frontend is nil, skip. if strategy.Frontend == nil { continue } // Skip any unknown frontend types. switch strategy.Frontend.Type { - case conciergeconfigv1alpha1.TokenCredentialRequestAPIFrontendType, conciergeconfigv1alpha1.ImpersonationProxyFrontendType: + case conciergeconfigv1alpha1.TokenCredentialRequestAPIFrontendType, + conciergeconfigv1alpha1.ImpersonationProxyFrontendType: default: continue } diff --git a/cmd/pinniped/cmd/kubeconfig_test.go b/cmd/pinniped/cmd/kubeconfig_test.go index 1a99584e1..55d29373c 100644 --- a/cmd/pinniped/cmd/kubeconfig_test.go +++ b/cmd/pinniped/cmd/kubeconfig_test.go @@ -613,18 +613,18 @@ func TestGetKubeconfig(t *testing.T) { &conciergeconfigv1alpha1.CredentialIssuer{ ObjectMeta: metav1.ObjectMeta{Name: "test-credential-issuer"}, Status: conciergeconfigv1alpha1.CredentialIssuerStatus{ - KubeConfigInfo: &conciergeconfigv1alpha1.CredentialIssuerKubeConfigInfo{ - Server: "https://concierge-endpoint", - CertificateAuthorityData: "ZmFrZS1jZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YS12YWx1ZQ==", - }, Strategies: []conciergeconfigv1alpha1.CredentialIssuerStrategy{{ Type: conciergeconfigv1alpha1.KubeClusterSigningCertificateStrategyType, Status: conciergeconfigv1alpha1.SuccessStrategyStatus, Reason: conciergeconfigv1alpha1.FetchedKeyStrategyReason, Message: "Successfully fetched key", LastUpdateTime: metav1.Now(), - // Simulate a previous version of CredentialIssuer that's missing this Frontend field. - Frontend: nil, + Frontend: &conciergeconfigv1alpha1.CredentialIssuerFrontend{ + Type: conciergeconfigv1alpha1.TokenCredentialRequestAPIFrontendType, + TokenCredentialRequestAPIInfo: &conciergeconfigv1alpha1.TokenCredentialRequestAPIInfo{ + Server: "https://concierge-endpoint.example.com", + }, + }, }}, }, }, diff --git a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.25/README.adoc b/generated/1.25/README.adoc index 228f4662f..47e6e0a00 100644 --- a/generated/1.25/README.adoc +++ b/generated/1.25/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-25-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-25-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-25-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-25-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-25-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.25/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.25/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.25/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.25/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.25/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.25/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.25/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.25/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.25/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.25/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.25/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.25/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.26/README.adoc b/generated/1.26/README.adoc index 2030e58d8..13eaefb76 100644 --- a/generated/1.26/README.adoc +++ b/generated/1.26/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-26-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-26-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-26-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-26-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-26-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.26/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.26/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.26/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.26/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.26/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.26/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.26/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.26/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.26/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.26/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.26/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.26/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.27/README.adoc b/generated/1.27/README.adoc index ea360be38..2c68468cc 100644 --- a/generated/1.27/README.adoc +++ b/generated/1.27/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-27-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-27-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-27-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-27-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-27-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.27/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.27/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.27/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.27/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.27/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.27/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.27/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.27/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.27/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.27/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.27/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.27/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.28/README.adoc b/generated/1.28/README.adoc index d5294234e..d69c92ae6 100644 --- a/generated/1.28/README.adoc +++ b/generated/1.28/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-28-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-28-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-28-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-28-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-28-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.28/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.28/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.28/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.28/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.28/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.28/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.28/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.28/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.28/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.28/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.28/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.28/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.29/README.adoc b/generated/1.29/README.adoc index 515f23f9e..7cf6c60e9 100644 --- a/generated/1.29/README.adoc +++ b/generated/1.29/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-29-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-29-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-29-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-29-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-29-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.29/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.29/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.29/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.29/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.29/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.29/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.29/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.29/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.29/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.29/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.29/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.29/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.30/README.adoc b/generated/1.30/README.adoc index d09662402..b05b1b5c8 100644 --- a/generated/1.30/README.adoc +++ b/generated/1.30/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-30-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-30-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-30-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-30-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-30-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.30/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.30/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.30/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.30/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.30/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.30/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.30/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.30/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.30/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.30/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.30/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.30/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/1.31/README.adoc b/generated/1.31/README.adoc index 15a38f849..3efbeb1b6 100644 --- a/generated/1.31/README.adoc +++ b/generated/1.31/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/1.31/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/1.31/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/1.31/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.31/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. diff --git a/generated/1.31/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go b/generated/1.31/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go index 213ff2229..d3cc37e71 100644 --- a/generated/1.31/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/1.31/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/generated/1.31/crds/config.concierge.pinniped.dev_credentialissuers.yaml b/generated/1.31/crds/config.concierge.pinniped.dev_credentialissuers.yaml index dccef52ea..ae264ed02 100644 --- a/generated/1.31/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.31/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -134,24 +134,6 @@ spec: status: description: CredentialIssuerStatus describes the status of the Concierge. properties: - kubeConfigInfo: - description: |- - Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - This field is deprecated and will be removed in a future version. - properties: - certificateAuthorityData: - description: The K8s API server CA bundle. - minLength: 1 - type: string - server: - description: The K8s API server URL. - minLength: 1 - pattern: ^https://|^http:// - type: string - required: - - certificateAuthorityData - - server - type: object strategies: description: List of integration strategies that were attempted by Pinniped. diff --git a/generated/latest/README.adoc b/generated/latest/README.adoc index 15a38f849..3efbeb1b6 100644 --- a/generated/latest/README.adoc +++ b/generated/latest/README.adoc @@ -428,25 +428,6 @@ This field is only set when Type is "ImpersonationProxy". + |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo"] -==== CredentialIssuerKubeConfigInfo - -CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -This type is deprecated and will be removed in a future version. - -.Appears In: -**** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerstatus[$$CredentialIssuerStatus$$] -**** - -[cols="25a,75a", options="header"] -|=== -| Field | Description -| *`server`* __string__ | The K8s API server URL. + -| *`certificateAuthorityData`* __string__ | The K8s API server CA bundle. + -|=== - - [id="{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerspec"] @@ -480,8 +461,6 @@ CredentialIssuerStatus describes the status of the Concierge. |=== | Field | Description | *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerstrategy[$$CredentialIssuerStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. + -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-31-apis-concierge-config-v1alpha1-credentialissuerkubeconfiginfo[$$CredentialIssuerKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. + -This field is deprecated and will be removed in a future version. + |=== diff --git a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go index de976f5c1..7f80f5178 100644 --- a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -161,24 +161,6 @@ type ImpersonationProxyServiceSpec struct { type CredentialIssuerStatus struct { // List of integration strategies that were attempted by Pinniped. Strategies []CredentialIssuerStrategy `json:"strategies"` - - // Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. - // This field is deprecated and will be removed in a future version. - // +optional - KubeConfigInfo *CredentialIssuerKubeConfigInfo `json:"kubeConfigInfo,omitempty"` -} - -// CredentialIssuerKubeConfigInfo provides the information needed to form a valid Pinniped-based kubeconfig using this credential issuer. -// This type is deprecated and will be removed in a future version. -type CredentialIssuerKubeConfigInfo struct { - // The K8s API server URL. - // +kubebuilder:validation:MinLength=1 - // +kubebuilder:validation:Pattern=`^https://|^http://` - Server string `json:"server"` - - // The K8s API server CA bundle. - // +kubebuilder:validation:MinLength=1 - CertificateAuthorityData string `json:"certificateAuthorityData"` } // CredentialIssuerStrategy describes the status of an integration strategy that was attempted by Pinniped. 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 213ff2229..d3cc37e71 100644 --- a/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go +++ b/generated/latest/apis/concierge/config/v1alpha1/zz_generated.deepcopy.go @@ -66,22 +66,6 @@ func (in *CredentialIssuerFrontend) DeepCopy() *CredentialIssuerFrontend { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CredentialIssuerKubeConfigInfo) DeepCopyInto(out *CredentialIssuerKubeConfigInfo) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CredentialIssuerKubeConfigInfo. -func (in *CredentialIssuerKubeConfigInfo) DeepCopy() *CredentialIssuerKubeConfigInfo { - if in == nil { - return nil - } - out := new(CredentialIssuerKubeConfigInfo) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CredentialIssuerList) DeepCopyInto(out *CredentialIssuerList) { *out = *in @@ -146,11 +130,6 @@ func (in *CredentialIssuerStatus) DeepCopyInto(out *CredentialIssuerStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.KubeConfigInfo != nil { - in, out := &in.KubeConfigInfo, &out.KubeConfigInfo - *out = new(CredentialIssuerKubeConfigInfo) - **out = **in - } return } diff --git a/internal/controller/issuerconfig/issuerconfig.go b/internal/controller/issuerconfig/issuerconfig.go index faea9ad30..7696be103 100644 --- a/internal/controller/issuerconfig/issuerconfig.go +++ b/internal/controller/issuerconfig/issuerconfig.go @@ -49,14 +49,6 @@ func mergeStrategy(configToUpdate *conciergeconfigv1alpha1.CredentialIssuerStatu configToUpdate.Strategies = append(configToUpdate.Strategies, strategy) } sort.Stable(sortableStrategies(configToUpdate.Strategies)) - - // Special case: the "TokenCredentialRequestAPI" data is mirrored into the deprecated status.kubeConfigInfo field. - if strategy.Frontend != nil && strategy.Frontend.Type == conciergeconfigv1alpha1.TokenCredentialRequestAPIFrontendType { - configToUpdate.KubeConfigInfo = &conciergeconfigv1alpha1.CredentialIssuerKubeConfigInfo{ - Server: strategy.Frontend.TokenCredentialRequestAPIInfo.Server, - CertificateAuthorityData: strategy.Frontend.TokenCredentialRequestAPIInfo.CertificateAuthorityData, - } - } } // weights are a set of priorities for each strategy type. diff --git a/internal/controller/issuerconfig/issuerconfig_test.go b/internal/controller/issuerconfig/issuerconfig_test.go index f671c03ea..4ce007878 100644 --- a/internal/controller/issuerconfig/issuerconfig_test.go +++ b/internal/controller/issuerconfig/issuerconfig_test.go @@ -87,10 +87,6 @@ func TestMergeStrategy(t *testing.T) { }, }, }, - KubeConfigInfo: &conciergeconfigv1alpha1.CredentialIssuerKubeConfigInfo{ - Server: "https://test-server", - CertificateAuthorityData: "test-ca-bundle", - }, }, }, { diff --git a/test/integration/concierge_credentialissuer_test.go b/test/integration/concierge_credentialissuer_test.go index 3ebb5de06..a7b401dad 100644 --- a/test/integration/concierge_credentialissuer_test.go +++ b/test/integration/concierge_credentialissuer_test.go @@ -36,7 +36,6 @@ func TestCredentialIssuer(t *testing.T) { require.Len(t, actualConfigList.Items, 1) actualConfig := actualConfigList.Items[0] - actualStatusKubeConfigInfo := actualConfigList.Items[0].Status.KubeConfigInfo for k, v := range env.ConciergeCustomLabels { require.Equalf(t, v, actualConfig.Labels[k], "expected ci to have label `%s: %s`", k, v) @@ -77,22 +76,11 @@ func TestCredentialIssuer(t *testing.T) { CertificateAuthorityData: base64.StdEncoding.EncodeToString(config.TLSClientConfig.CAData), } require.Equal(t, &expectedTokenRequestAPIInfo, actualStatusStrategy.Frontend.TokenCredentialRequestAPIInfo) - - // Verify the published kube config info. - require.Equal( - t, - &conciergeconfigv1alpha1.CredentialIssuerKubeConfigInfo{ - Server: expectedTokenRequestAPIInfo.Server, - CertificateAuthorityData: expectedTokenRequestAPIInfo.CertificateAuthorityData, - }, - actualStatusKubeConfigInfo, - ) } else { require.Equal(t, conciergeconfigv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status) require.Equal(t, conciergeconfigv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason) require.Contains(t, actualStatusStrategy.Message, "could not find a healthy kube-controller-manager pod (0 candidates): "+ "note that this error is the expected behavior for some cluster types, including most cloud provider clusters (e.g. GKE, AKS, EKS)") - require.Nil(t, actualStatusKubeConfigInfo) } }) } diff --git a/test/integration/kube_api_discovery_test.go b/test/integration/kube_api_discovery_test.go index a166e552d..94bc399a3 100644 --- a/test/integration/kube_api_discovery_test.go +++ b/test/integration/kube_api_discovery_test.go @@ -452,7 +452,7 @@ func TestGetAPIResourceList(t *testing.T) { //nolint:gocyclo // each t.Run is pr } // manually update this value whenever you add additional fields to an API resource and then run the generator - totalExpectedAPIFields := 313 + totalExpectedAPIFields := 310 // Because we are parsing text from `kubectl explain` and because the format of that text can change // over time, make a rudimentary assertion that this test exercised the whole tree of all fields of all