Skip to content

Commit

Permalink
Update go.mod
Browse files Browse the repository at this point in the history
Signed-off-by: Sabbir <[email protected]>
  • Loading branch information
sabbir-hossain70 committed Aug 22, 2024
1 parent 23ee61d commit d8af824
Show file tree
Hide file tree
Showing 14 changed files with 188 additions and 22 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.0-rc.2.0.20240815122515-e51cacc5e58f
kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5
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 @@ -802,8 +802,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.0-rc.2.0.20240815122515-e51cacc5e58f h1:nZ4JJb4hSJPNqHqbKL1jamBbroUQB+0bwha4xwaFnmU=
kubedb.dev/apimachinery v0.47.0-rc.2.0.20240815122515-e51cacc5e58f/go.mod h1:rBcbP9564zy6gla7nMmQs7NsFS0OwB958AJijeAO2zY=
kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5 h1:+gfLsub9ZyzO9XSydpELJPz1WUsp1rjAR6p2JF3b34k=
kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5/go.mod h1:VSzi3IpellQ8ZqtEu3FokfN6siZdG2AB87wPXv9Xh54=
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
14 changes: 14 additions & 0 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go

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 @@ -197,7 +197,7 @@ func (p *PgBouncer) SetDefaults(pgBouncerVersion *catalog.PgBouncerVersion, uses
}

if p.Spec.DeletionPolicy == "" {
p.Spec.DeletionPolicy = PgBouncerDeletionPolicyDelete
p.Spec.DeletionPolicy = DeletionPolicyDelete
}

p.setConnectionPoolConfigDefaults()
Expand Down
18 changes: 5 additions & 13 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,16 @@ type PgBouncerSpec struct {

// DeletionPolicy controls the delete operation for database
// +optional
DeletionPolicy PgBouncerDeletionPolicy `json:"deletionPolicy,omitempty"`
DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"`

// HealthChecker defines attributes of the health checker
// +optional
// +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1}
HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"`

// Indicates that the database is halted and all offshoot Kubernetes resources are deleted.
// +optional
Halted bool `json:"halted,omitempty"`
}

// +kubebuilder:validation:Enum=server;archiver;metrics-exporter
Expand Down Expand Up @@ -262,15 +266,3 @@ const (
// to Send the client cert and client key certificate for authentication.
PgBouncerClientAuthModeCert PgBouncerClientAuthMode = "cert"
)

// +kubebuilder:validation:Enum=Delete;WipeOut;DoNotTerminate
type PgBouncerDeletionPolicy string

const (
// Deletes database pods, service, pvcs but leave the stash backup data intact.
PgBouncerDeletionPolicyDelete PgBouncerDeletionPolicy = "Delete"
// Deletes database pods, service, pvcs and stash backup data.
PgBouncerDeletionPolicyWipeOut PgBouncerDeletionPolicy = "WipeOut"
// Rejects attempt to delete database using ValidationWebhook.
PgBouncerDeletionPolicyDoNotTerminate PgBouncerDeletionPolicy = "DoNotTerminate"
)
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ type ProxySQLSpec struct {
// +optional
// +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1}
HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"`

// Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted.
// +optional
Halted bool `json:"halted,omitempty"`
}

// +kubebuilder:validation:Enum=server;archiver;metrics-exporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ func Convert_v1alpha2_PgBouncerSpec_To_v1_PgBouncerSpec(in *PgBouncerSpec, out *
out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor))
out.SSLMode = v1.PgBouncerSSLMode(in.SSLMode)
out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS))
out.DeletionPolicy = v1.PgBouncerDeletionPolicy(in.TerminationPolicy)
out.DeletionPolicy = v1.DeletionPolicy(in.TerminationPolicy)
out.HealthChecker = in.HealthChecker
return nil
}
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 @@ -105,6 +105,10 @@ type PgBouncerSpec struct {
// +optional
// +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1}
HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"`

// Indicates that the database is halted and all offshoot Kubernetes resources are deleted.
// +optional
Halted bool `json:"halted,omitempty"`
}

// +kubebuilder:validation:Enum=server;archiver;metrics-exporter
Expand Down Expand Up @@ -262,10 +266,12 @@ const (
PgBouncerClientAuthModeCert PgBouncerClientAuthMode = "cert"
)

// +kubebuilder:validation:Enum=Delete;WipeOut;DoNotTerminate
// +kubebuilder:validation:Enum=Halt;Delete;WipeOut;DoNotTerminate
type PgBouncerTerminationPolicy string

const (
// Deletes database pods, service but leave the PVCs and stash backup data intact.
PgBouncerDeletionPolicyHalt PgBouncerTerminationPolicy = "Halt"
// Deletes database pods, service, pvcs but leave the stash backup data intact.
PgBouncerTerminationPolicyDelete PgBouncerTerminationPolicy = "Delete"
// Deletes database pods, service, pvcs and stash backup data.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ type ProxySQLSpec struct {
// +optional
// +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1}
HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"`

// Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted.
// +optional
Halted bool `json:"halted,omitempty"`
}

// +kubebuilder:validation:Enum=server;archiver;metrics-exporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,13 @@ spec:
type: object
deletionPolicy:
enum:
- Halt
- Delete
- WipeOut
- DoNotTerminate
type: string
halted:
type: boolean
healthChecker:
default:
failureThreshold: 1
Expand Down Expand Up @@ -3790,6 +3793,8 @@ spec:
- databaseName
- databaseRef
type: object
halted:
type: boolean
healthChecker:
default:
failureThreshold: 1
Expand Down Expand Up @@ -6729,6 +6734,7 @@ spec:
type: string
terminationPolicy:
enum:
- Halt
- Delete
- WipeOut
- DoNotTerminate
Expand Down
4 changes: 4 additions & 0 deletions vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ spec:
- WipeOut
- DoNotTerminate
type: string
halted:
type: boolean
healthChecker:
default:
failureThreshold: 1
Expand Down Expand Up @@ -3701,6 +3703,8 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
halted:
type: boolean
healthChecker:
default:
failureThreshold: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,139 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
horizontalScaling:
properties:
aggregator:
format: int32
type: integer
leaf:
format: int32
type: integer
type: object
restart:
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
- HorizontalScaling
- VerticalScaling
- VolumeExpansion
- Restart
- Configuration
- ReconfigureTLS
type: string
updateVersion:
properties:
targetVersion:
type: string
type: object
verticalScaling:
properties:
aggregator:
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ github.com/pierrec/lz4/v4/internal/xxh32
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1
# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2
## explicit; go 1.22.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1
Expand Down Expand Up @@ -1534,7 +1534,7 @@ k8s.io/utils/trace
# kmodules.xyz/apiversion v0.2.0
## explicit; go 1.14
kmodules.xyz/apiversion
# kmodules.xyz/client-go v0.30.9
# kmodules.xyz/client-go v0.30.13
## explicit; go 1.22.0
kmodules.xyz/client-go
kmodules.xyz/client-go/api/v1
Expand All @@ -1561,7 +1561,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.0-rc.2.0.20240815122515-e51cacc5e58f
# kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5
## explicit; go 1.22.1
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/catalog
Expand Down

0 comments on commit d8af824

Please sign in to comment.