From 077aa8a42e278d7e8e94e472736e2b90529a307f Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Fri, 12 Mar 2021 13:23:24 -0600 Subject: [PATCH] Fix a copy-paste typo in the ImpersonationProxyInfo JSON field name. Signed-off-by: Matt Moyer --- apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl | 2 +- .../config.concierge.pinniped.dev_credentialissuers.yaml | 4 ++-- generated/1.17/README.adoc | 2 +- .../apis/concierge/config/v1alpha1/types_credentialissuer.go | 2 +- .../crds/config.concierge.pinniped.dev_credentialissuers.yaml | 4 ++-- generated/1.18/README.adoc | 2 +- .../apis/concierge/config/v1alpha1/types_credentialissuer.go | 2 +- .../crds/config.concierge.pinniped.dev_credentialissuers.yaml | 4 ++-- generated/1.19/README.adoc | 2 +- .../apis/concierge/config/v1alpha1/types_credentialissuer.go | 2 +- .../crds/config.concierge.pinniped.dev_credentialissuers.yaml | 4 ++-- generated/1.20/README.adoc | 2 +- .../apis/concierge/config/v1alpha1/types_credentialissuer.go | 2 +- .../crds/config.concierge.pinniped.dev_credentialissuers.yaml | 4 ++-- .../apis/concierge/config/v1alpha1/types_credentialissuer.go | 2 +- go.sum | 1 - 16 files changed, 20 insertions(+), 21 deletions(-) diff --git a/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl b/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl index e38b207b..3c0c8ba0 100644 --- a/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl +++ b/apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 diff --git a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml index 7436f6e2..8123f238 100644 --- a/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml @@ -77,7 +77,7 @@ spec: PEM CA bundle of the impersonation proxy. minLength: 1 type: string - server: + endpoint: description: Endpoint is the HTTPS endpoint of the impersonation proxy. minLength: 1 @@ -85,7 +85,7 @@ spec: type: string required: - certificateAuthorityData - - server + - endpoint type: object tokenCredentialRequestInfo: description: TokenCredentialRequestAPIInfo describes the diff --git a/generated/1.17/README.adoc b/generated/1.17/README.adoc index b062b7f4..25267e8c 100644 --- a/generated/1.17/README.adoc +++ b/generated/1.17/README.adoc @@ -328,7 +328,7 @@ Status of a credential issuer. [cols="25a,75a", options="header"] |=== | Field | Description -| *`server`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. +| *`endpoint`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. | *`certificateAuthorityData`* __string__ | CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. |=== 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 e38b207b..3c0c8ba0 100644 --- a/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 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 7436f6e2..8123f238 100644 --- a/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -77,7 +77,7 @@ spec: PEM CA bundle of the impersonation proxy. minLength: 1 type: string - server: + endpoint: description: Endpoint is the HTTPS endpoint of the impersonation proxy. minLength: 1 @@ -85,7 +85,7 @@ spec: type: string required: - certificateAuthorityData - - server + - endpoint type: object tokenCredentialRequestInfo: description: TokenCredentialRequestAPIInfo describes the diff --git a/generated/1.18/README.adoc b/generated/1.18/README.adoc index 18ec63f7..2c01f927 100644 --- a/generated/1.18/README.adoc +++ b/generated/1.18/README.adoc @@ -328,7 +328,7 @@ Status of a credential issuer. [cols="25a,75a", options="header"] |=== | Field | Description -| *`server`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. +| *`endpoint`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. | *`certificateAuthorityData`* __string__ | CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. |=== 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 e38b207b..3c0c8ba0 100644 --- a/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 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 7436f6e2..8123f238 100644 --- a/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -77,7 +77,7 @@ spec: PEM CA bundle of the impersonation proxy. minLength: 1 type: string - server: + endpoint: description: Endpoint is the HTTPS endpoint of the impersonation proxy. minLength: 1 @@ -85,7 +85,7 @@ spec: type: string required: - certificateAuthorityData - - server + - endpoint type: object tokenCredentialRequestInfo: description: TokenCredentialRequestAPIInfo describes the diff --git a/generated/1.19/README.adoc b/generated/1.19/README.adoc index 612620fe..0c2527ae 100644 --- a/generated/1.19/README.adoc +++ b/generated/1.19/README.adoc @@ -328,7 +328,7 @@ Status of a credential issuer. [cols="25a,75a", options="header"] |=== | Field | Description -| *`server`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. +| *`endpoint`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. | *`certificateAuthorityData`* __string__ | CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. |=== 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 e38b207b..3c0c8ba0 100644 --- a/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 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 7436f6e2..8123f238 100644 --- a/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -77,7 +77,7 @@ spec: PEM CA bundle of the impersonation proxy. minLength: 1 type: string - server: + endpoint: description: Endpoint is the HTTPS endpoint of the impersonation proxy. minLength: 1 @@ -85,7 +85,7 @@ spec: type: string required: - certificateAuthorityData - - server + - endpoint type: object tokenCredentialRequestInfo: description: TokenCredentialRequestAPIInfo describes the diff --git a/generated/1.20/README.adoc b/generated/1.20/README.adoc index 97b02d4e..91b4eef6 100644 --- a/generated/1.20/README.adoc +++ b/generated/1.20/README.adoc @@ -328,7 +328,7 @@ Status of a credential issuer. [cols="25a,75a", options="header"] |=== | Field | Description -| *`server`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. +| *`endpoint`* __string__ | Endpoint is the HTTPS endpoint of the impersonation proxy. | *`certificateAuthorityData`* __string__ | CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. |=== 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 e38b207b..3c0c8ba0 100644 --- a/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 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 7436f6e2..8123f238 100644 --- a/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml +++ b/generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml @@ -77,7 +77,7 @@ spec: PEM CA bundle of the impersonation proxy. minLength: 1 type: string - server: + endpoint: description: Endpoint is the HTTPS endpoint of the impersonation proxy. minLength: 1 @@ -85,7 +85,7 @@ spec: type: string required: - certificateAuthorityData - - server + - endpoint type: object tokenCredentialRequestInfo: description: TokenCredentialRequestAPIInfo describes the diff --git a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go index e38b207b..3c0c8ba0 100644 --- a/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go +++ b/generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go @@ -111,7 +111,7 @@ type ImpersonationProxyInfo struct { // Endpoint is the HTTPS endpoint of the impersonation proxy. // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:Pattern=`^https://` - Endpoint string `json:"server"` + Endpoint string `json:"endpoint"` // CertificateAuthorityData is the base64-encoded PEM CA bundle of the impersonation proxy. // +kubebuilder:validation:MinLength=1 diff --git a/go.sum b/go.sum index 8a2191e1..74408122 100644 --- a/go.sum +++ b/go.sum @@ -1176,7 +1176,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=