Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
Signed-off-by: pritamdas99 <[email protected]>
  • Loading branch information
pritamdas99 committed Sep 26, 2024
1 parent e89a9e7 commit 3aafeba
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 25 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions solr/kubedb_client_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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 == "" {
Expand Down Expand Up @@ -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/<alias>".
func (s *Solr) CertSecretVolumeMountPath(configDir string, cert string) string {
return filepath.Join(configDir, cert)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
checkPeerName:
type: boolean
clientAuth:
clientAuthSSL:
type: string
configSecret:
properties:
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3aafeba

Please sign in to comment.