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
pritamdas99 committed Sep 17, 2024
1 parent 774c3bb commit 3c04cbb
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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.20240830114015-563305ad0018
kubedb.dev/apimachinery v0.47.1-0.20240911053140-5d153c926afa
sigs.k8s.io/controller-runtime v0.18.4
xorm.io/xorm v1.3.6
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,8 +793,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.20240830114015-563305ad0018 h1:O2lz+czQuuV2rrzYC/xi/4dV7UR1qt/i2MdvGcSczkI=
kubedb.dev/apimachinery v0.47.1-0.20240830114015-563305ad0018/go.mod h1:dsSAmHt0j14fmKhtFZC4RlX4Aiytz/RVq3S0b30Mkug=
kubedb.dev/apimachinery v0.47.1-0.20240911053140-5d153c926afa h1:w+CNe6lhG79TXTqaGwFBnHWrwV3+k4KEq7ISbxqDaKs=
kubedb.dev/apimachinery v0.47.1-0.20240911053140-5d153c926afa/go.mod h1:dsSAmHt0j14fmKhtFZC4RlX4Aiytz/RVq3S0b30Mkug=
kubeops.dev/petset v0.0.6 h1:0IbvxD9fadZfH+3iMZWzN6ZHsO0vX458JlioamwyPKQ=
kubeops.dev/petset v0.0.6/go.mod h1:A15vh0r979NsvL65DTIZKWsa/NoX9VapHBAEw1ZsdYI=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
Expand Down
21 changes: 21 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go
View file

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

10 changes: 10 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,14 @@ func (s solrStatsService) TLSConfig() *promapi.TLSConfig {
return nil
}

func (s *Solr) SetTLSDefaults() {
if s.Spec.TLS == nil || s.Spec.TLS.IssuerRef == nil {
return
}
s.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(s.Spec.TLS.Certificates, string(SolrServerCert), s.CertificateName(SolrServerCert))
s.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(s.Spec.TLS.Certificates, string(SolrClientCert), s.CertificateName(SolrClientCert))
}

func (s *Solr) StatsService() mona.StatsAccessor {
return &solrStatsService{s}
}
Expand Down Expand Up @@ -360,6 +368,8 @@ func (s *Solr) SetDefaults() {
}
s.Spec.Monitor.SetDefaults()
}

s.SetTLSDefaults()
}

func (s *Solr) setDefaultContainerSecurityContext(slVersion *catalog.SolrVersion, podTemplate *ofst.PodTemplateSpec) {
Expand Down
9 changes: 9 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ type SolrSpec struct {
// To enable ssl for http layer
EnableSSL bool `json:"enableSSL,omitempty"`

// Client auth need
NeedClientAuth bool `json:"needClientAuth,omitempty"`

// Client auth want
WantClientAuth bool `json:"wantClientAuth,omitempty"`

// Check peer name
CheckPeerName bool `json:"checkPeerName,omitempty"`

// TLS contains tls configurations for client and server.
// +optional
TLS *kmapi.TLSConfig `json:"tls,omitempty"`
Expand Down
6 changes: 6 additions & 0 deletions vendor/kubedb.dev/apimachinery/crds/kubedb.com_solrs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
checkPeerName:
type: boolean
configSecret:
properties:
name:
Expand Down Expand Up @@ -309,6 +311,8 @@ spec:
type: object
type: object
type: object
needClientAuth:
type: boolean
podTemplate:
properties:
controller:
Expand Down Expand Up @@ -13134,6 +13138,8 @@ spec:
type: object
version:
type: string
wantClientAuth:
type: boolean
zookeeperDigestReadonlySecret:
properties:
name:
Expand Down
106 changes: 106 additions & 0 deletions vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_solropsrequests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,119 @@ spec:
type: object
timeout:
type: string
tls:
properties:
certificates:
items:
properties:
alias:
type: string
dnsNames:
items:
type: string
type: array
duration:
type: string
emailAddresses:
items:
type: string
type: array
ipAddresses:
items:
type: string
type: array
issuerRef:
properties:
apiGroup:
type: string
kind:
type: string
name:
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
privateKey:
properties:
encoding:
enum:
- PKCS1
- PKCS8
type: string
type: object
renewBefore:
type: string
secretName:
type: string
subject:
properties:
countries:
items:
type: string
type: array
localities:
items:
type: string
type: array
organizationalUnits:
items:
type: string
type: array
organizations:
items:
type: string
type: array
postalCodes:
items:
type: string
type: array
provinces:
items:
type: string
type: array
serialNumber:
type: string
streetAddresses:
items:
type: string
type: array
type: object
uris:
items:
type: string
type: array
required:
- alias
type: object
type: array
issuerRef:
properties:
apiGroup:
type: string
kind:
type: string
name:
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
remove:
type: boolean
rotateCertificates:
type: boolean
type: object
type:
enum:
- UpdateVersion
- VerticalScaling
- VolumeExpansion
- Reconfigure
- Restart
- ReconfigureTLS
type: string
updateVersion:
properties:
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,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.20240830114015-563305ad0018
# kubedb.dev/apimachinery v0.47.1-0.20240911053140-5d153c926afa
## explicit; go 1.22.1
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/catalog
Expand Down

0 comments on commit 3c04cbb

Please sign in to comment.