diff --git a/go.mod b/go.mod index 94657338..9ff73461 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( k8s.io/klog/v2 v2.130.1 kmodules.xyz/client-go v0.30.13 kmodules.xyz/custom-resources v0.30.0 - kubedb.dev/apimachinery v0.47.1-0.20240926104656-0509d7a29d6b + kubedb.dev/apimachinery v0.47.1-0.20240926114257-108f2b41a885 sigs.k8s.io/controller-runtime v0.18.4 xorm.io/xorm v1.3.6 ) diff --git a/go.sum b/go.sum index c7245704..db1fa0cc 100644 --- a/go.sum +++ b/go.sum @@ -804,8 +804,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/offshoot-api v0.30.0 h1:dq9F93pu4Q8rL9oTcCk+vGGy8vpS7RNt0GSwx7Bvhec= kmodules.xyz/offshoot-api v0.30.0/go.mod h1:o9VoA3ImZMDBp3lpLb8+kc2d/KBxioRwCpaKDfLIyDw= -kubedb.dev/apimachinery v0.47.1-0.20240926104656-0509d7a29d6b h1:iCd7isvaQ1DlhhSXjFEeHTy7yj60HoKE9sUzWYcm5YY= -kubedb.dev/apimachinery v0.47.1-0.20240926104656-0509d7a29d6b/go.mod h1:oyCAmVdJXFLs2jfSqjMFV5pcKdt0v4U4hIuVAaLYv+Q= +kubedb.dev/apimachinery v0.47.1-0.20240926114257-108f2b41a885 h1:Tgo6RxT0xOwbGox9u92GFUj4/1cQYQ+E2SMPm+TWiKQ= +kubedb.dev/apimachinery v0.47.1-0.20240926114257-108f2b41a885/go.mod h1:oyCAmVdJXFLs2jfSqjMFV5pcKdt0v4U4hIuVAaLYv+Q= kubeops.dev/petset v0.0.5-0.20240603165102-e2d9decb8abe h1:uWyps3VIDFwGuL0yQa0eMGaLg4ofVwpy59U14Trxnz8= kubeops.dev/petset v0.0.5-0.20240603165102-e2d9decb8abe/go.mod h1:A15vh0r979NsvL65DTIZKWsa/NoX9VapHBAEw1ZsdYI= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/solr/kubedb_client_builder.go b/solr/kubedb_client_builder.go index 933d59ce..0c481275 100644 --- a/solr/kubedb_client_builder.go +++ b/solr/kubedb_client_builder.go @@ -126,8 +126,8 @@ func (o *KubeDBClientBuilder) GetSolrClient() (*Client, error) { klog.Error(err, "failed to create certificate for TLS config") return nil, err } - clientCA.AppendCertsFromPEM(certSecret.Data["ca.crt"]) - rootCA.AppendCertsFromPEM(certSecret.Data["ca.crt"]) + clientCA.AppendCertsFromPEM(certSecret.Data[kubedb.CACert]) + rootCA.AppendCertsFromPEM(certSecret.Data[kubedb.CACert]) config.transport.TLSClientConfig = &tls.Config{ Certificates: []tls.Certificate{crt}, diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go index d224bb51..f4cc74a8 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go @@ -34603,20 +34603,13 @@ func schema_apimachinery_apis_kubedb_v1alpha2_SolrSpec(ref common.ReferenceCallb Format: "", }, }, - "clientAuth": { + "clientAuthSSL": { SchemaProps: spec.SchemaProps{ Description: "Client auth need or want", Type: []string{"string"}, Format: "", }, }, - "checkPeerName": { - SchemaProps: spec.SchemaProps{ - Description: "Check peer name", - Type: []string{"boolean"}, - Format: "", - }, - }, "tls": { SchemaProps: spec.SchemaProps{ Description: "TLS contains tls configurations for client and server.", diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go index dcece811..b91305a7 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go @@ -254,8 +254,8 @@ func (s *Solr) SetDefaults() { s.Spec.DeletionPolicy = TerminationPolicyDelete } - if s.Spec.ClientAuth != "need" && s.Spec.ClientAuth != "want" { - s.Spec.ClientAuth = "" + if s.Spec.ClientAuthSSL != "need" && s.Spec.ClientAuthSSL != "want" { + s.Spec.ClientAuthSSL = "" } if s.Spec.StorageType == "" { @@ -505,8 +505,6 @@ func (s *Solr) CertSecretVolumeName(alias SolrCertificateAlias) string { } // CertSecretVolumeMountPath returns the CertSecretVolumeMountPath -// if configDir is "/opt/kafka/config", -// mountPath will be, "/opt/kafka/config/". func (s *Solr) CertSecretVolumeMountPath(configDir string, cert string) string { return filepath.Join(configDir, cert) } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go index a9f93ab1..1587bc34 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go @@ -84,10 +84,7 @@ type SolrSpec struct { EnableSSL bool `json:"enableSSL,omitempty"` // Client auth need or want - ClientAuth string `json:"clientAuth,omitempty"` - - // Check peer name - CheckPeerName bool `json:"checkPeerName,omitempty"` + ClientAuthSSL string `json:"clientAuthSSL,omitempty"` // TLS contains tls configurations for client and server. // +optional diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml index f5147eb9..ecd6f8b6 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml @@ -60,9 +60,7 @@ spec: type: string type: object x-kubernetes-map-type: atomic - checkPeerName: - type: boolean - clientAuth: + clientAuthSSL: type: string configSecret: properties: diff --git a/vendor/modules.txt b/vendor/modules.txt index 8a20af8e..0b1704e4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1564,7 +1564,7 @@ kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v1/conversion kmodules.xyz/offshoot-api/api/v2 kmodules.xyz/offshoot-api/util -# kubedb.dev/apimachinery v0.47.1-0.20240926104656-0509d7a29d6b +# kubedb.dev/apimachinery v0.47.1-0.20240926114257-108f2b41a885 ## explicit; go 1.22.1 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/catalog