From 52c5d171674218e75ab4a35dc03a7ae0a0c32176 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Dec 2023 00:49:55 +0000 Subject: [PATCH] chore(userconfigs): generate files --- api/v1alpha1/userconfig/service/opensearch/opensearch.go | 2 +- .../userconfig/service/opensearch/zz_generated.deepcopy.go | 5 ----- .../aiven-operator-crds/templates/aiven.io_opensearches.yaml | 1 + config/crd/bases/aiven.io_opensearches.yaml | 1 + docs/docs/api-reference/opensearch.md | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/api/v1alpha1/userconfig/service/opensearch/opensearch.go b/api/v1alpha1/userconfig/service/opensearch/opensearch.go index 474c04065..5700543fa 100644 --- a/api/v1alpha1/userconfig/service/opensearch/opensearch.go +++ b/api/v1alpha1/userconfig/service/opensearch/opensearch.go @@ -65,7 +65,7 @@ type Openid struct { ConnectUrl string `groups:"create,update" json:"connect_url"` // Enables or disables OpenID Connect authentication for OpenSearch. When enabled, users can authenticate using OpenID Connect with an Identity Provider. - Enabled *bool `groups:"create,update" json:"enabled,omitempty"` + Enabled bool `groups:"create,update" json:"enabled"` // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:MaxLength=1024 diff --git a/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go index 171d00ad3..953a86270 100644 --- a/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go +++ b/api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go @@ -200,11 +200,6 @@ func (in *IpRateLimiting) DeepCopy() *IpRateLimiting { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Openid) DeepCopyInto(out *Openid) { *out = *in - if in.Enabled != nil { - in, out := &in.Enabled, &out.Enabled - *out = new(bool) - **out = **in - } if in.Header != nil { in, out := &in.Header, &out.Header *out = new(string) diff --git a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml index 84218dae7..7fa9b0acc 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml @@ -355,6 +355,7 @@ spec: - client_id - client_secret - connect_url + - enabled type: object opensearch: description: OpenSearch settings diff --git a/config/crd/bases/aiven.io_opensearches.yaml b/config/crd/bases/aiven.io_opensearches.yaml index 84218dae7..7fa9b0acc 100644 --- a/config/crd/bases/aiven.io_opensearches.yaml +++ b/config/crd/bases/aiven.io_opensearches.yaml @@ -355,6 +355,7 @@ spec: - client_id - client_secret - connect_url + - enabled type: object opensearch: description: OpenSearch settings diff --git a/docs/docs/api-reference/opensearch.md b/docs/docs/api-reference/opensearch.md index eb4ee0a9f..db5c6ee47 100644 --- a/docs/docs/api-reference/opensearch.md +++ b/docs/docs/api-reference/opensearch.md @@ -202,10 +202,10 @@ OpenSearch OpenID Connect Configuration. - [`client_id`](#spec.userConfig.openid.client_id-property){: name='spec.userConfig.openid.client_id-property'} (string, MinLength: 1, MaxLength: 1024). The ID of the OpenID Connect client configured in your IdP. Required. - [`client_secret`](#spec.userConfig.openid.client_secret-property){: name='spec.userConfig.openid.client_secret-property'} (string, MinLength: 1, MaxLength: 1024). The client secret of the OpenID Connect client configured in your IdP. Required. - [`connect_url`](#spec.userConfig.openid.connect_url-property){: name='spec.userConfig.openid.connect_url-property'} (string, MaxLength: 2048). The URL of your IdP where the Security plugin can find the OpenID Connect metadata/configuration settings. +- [`enabled`](#spec.userConfig.openid.enabled-property){: name='spec.userConfig.openid.enabled-property'} (boolean). Enables or disables OpenID Connect authentication for OpenSearch. When enabled, users can authenticate using OpenID Connect with an Identity Provider. **Optional** -- [`enabled`](#spec.userConfig.openid.enabled-property){: name='spec.userConfig.openid.enabled-property'} (boolean). Enables or disables OpenID Connect authentication for OpenSearch. When enabled, users can authenticate using OpenID Connect with an Identity Provider. - [`header`](#spec.userConfig.openid.header-property){: name='spec.userConfig.openid.header-property'} (string, MinLength: 1, MaxLength: 1024). HTTP header name of the JWT token. Optional. Default is Authorization. - [`jwt_header`](#spec.userConfig.openid.jwt_header-property){: name='spec.userConfig.openid.jwt_header-property'} (string, MinLength: 1, MaxLength: 1024). The HTTP header that stores the token. Typically the Authorization header with the Bearer schema: Authorization: Bearer . Optional. Default is Authorization. - [`jwt_url_parameter`](#spec.userConfig.openid.jwt_url_parameter-property){: name='spec.userConfig.openid.jwt_url_parameter-property'} (string, MinLength: 1, MaxLength: 1024). If the token is not transmitted in the HTTP header, but as an URL parameter, define the name of the parameter here. Optional.