From 46a619a7f911e8cb499543f5550a37dc076841e8 Mon Sep 17 00:00:00 2001 From: 1gtm <1gtm@appscode.com> Date: Wed, 21 Aug 2024 16:16:26 +0000 Subject: [PATCH] Prepare for release v0.2.0 ProductLine: KubeDB Release: v2024.8.21 Release-tracker: https://github.com/kubedb/CHANGELOG/pull/98 Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ vendor/kmodules.xyz/client-go/Makefile | 2 +- vendor/kmodules.xyz/client-go/api/v1/cluster.go | 15 ++++++++++++++- vendor/kmodules.xyz/client-go/api/v1/object.go | 4 ++-- .../kmodules.xyz/client-go/api/v1/object_enum.go | 5 ----- .../client-go/apiextensions/controller.go | 4 +++- .../kmodules.xyz/client-go/meta/preconditions.go | 4 ++-- vendor/modules.txt | 6 +++--- 9 files changed, 34 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 8ce3c3a8f..004c25a63 100644 --- a/go.mod +++ b/go.mod @@ -30,9 +30,9 @@ require ( k8s.io/api v0.30.2 k8s.io/apimachinery v0.30.2 k8s.io/klog/v2 v2.130.1 - kmodules.xyz/client-go v0.30.9 + kmodules.xyz/client-go v0.30.13 kmodules.xyz/custom-resources v0.30.0 - kubedb.dev/apimachinery v0.47.0-rc.3 + kubedb.dev/apimachinery v0.47.0 sigs.k8s.io/controller-runtime v0.18.4 xorm.io/xorm v1.3.6 ) @@ -96,7 +96,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/paulmach/orb v0.11.1 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1 // indirect + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.46.0 // indirect diff --git a/go.sum b/go.sum index 3aabb62f5..b8edbea06 100644 --- a/go.sum +++ b/go.sum @@ -413,8 +413,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1 h1:+iiljhJV6niK7MuifJs/n3NeLxikd85nrQfn53sLJkU= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 h1:6UsAv+jAevuGO2yZFU/BukV4o9NKnFMOuoouSA4G0ns= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= @@ -785,16 +785,16 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= -kmodules.xyz/client-go v0.30.9 h1:wiLivFlqVZOitAqLFEa1n53GkbYYOmiR8upjIHPHrYk= -kmodules.xyz/client-go v0.30.9/go.mod h1:XL3PDQIXG4s3xNRL2SSxIvi8b2WyMGpn26dFnOBz0j4= +kmodules.xyz/client-go v0.30.13 h1:Tpvg7ZlSNlzjB0NZT9hUe9JrO7FN4PjUUF1hNUXSku0= +kmodules.xyz/client-go v0.30.13/go.mod h1:XL3PDQIXG4s3xNRL2SSxIvi8b2WyMGpn26dFnOBz0j4= kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o= kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24= kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9H1UFRwB4= 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.3 h1:o5KpBZsYuUr2EJ/NMyyAtZ4lT7g1UabriZUxSynWZRs= -kubedb.dev/apimachinery v0.47.0-rc.3/go.mod h1:XkzWrijuH4skCU2ru+Ye9O0KSWQ7Nn2mRjP3+F3StLk= +kubedb.dev/apimachinery v0.47.0 h1:QhcjY2wJb/5L0YmfJAUiPw0VU1mMJqvILL2t8znniJo= +kubedb.dev/apimachinery v0.47.0/go.mod h1:W/uKm13rLuaz+uqZUt6piU/qA0EdLKHuN53V2DYheJI= 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= diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index 83988a83f..4ff50bd7c 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12 BASEIMAGE_DBG ?= debian:bookworm -GO_VERSION ?= 1.22 +GO_VERSION ?= 1.23 BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) diff --git a/vendor/kmodules.xyz/client-go/api/v1/cluster.go b/vendor/kmodules.xyz/client-go/api/v1/cluster.go index 057cb55ab..1de796faf 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/cluster.go +++ b/vendor/kmodules.xyz/client-go/api/v1/cluster.go @@ -16,7 +16,13 @@ limitations under the License. package v1 -import "strings" +import ( + "crypto/hmac" + "crypto/sha256" + "encoding/base64" + "fmt" + "strings" +) // +kubebuilder:validation:Enum=Aws;Azure;DigitalOcean;GoogleCloud;Linode;Packet;Scaleway;Vultr;BareMetal;KIND;Generic;Private type HostingProvider string @@ -56,6 +62,13 @@ type ClusterMetadata struct { CABundle string `json:"caBundle,omitempty"` } +func (md ClusterMetadata) State() string { + hasher := hmac.New(sha256.New, []byte(md.UID)) + state := fmt.Sprintf("%s,%s", md.APIEndpoint, md.OwnerID) + hasher.Write([]byte(state)) + return base64.URLEncoding.EncodeToString(hasher.Sum(nil)) +} + /* ENUM( diff --git a/vendor/kmodules.xyz/client-go/api/v1/object.go b/vendor/kmodules.xyz/client-go/api/v1/object.go index 419d3cab3..073c8141e 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/object.go +++ b/vendor/kmodules.xyz/client-go/api/v1/object.go @@ -216,8 +216,8 @@ type ObjectInfo struct { Ref ObjectReference `json:"ref" protobuf:"bytes,2,opt,name=ref"` } -// +kubebuilder:validation:Enum=authn;authz;auth_secret;backup_via;catalog;cert_issuer;config;connect_via;exposed_by;event;located_on;monitored_by;ocm_bind;offshoot;ops;placed_into;policy;recommended_for;restore_into;scaled_by;source;storage;view -// ENUM(authn,authz,auth_secret,backup_via,catalog,cert_issuer,config,connect_via,exposed_by,event,located_on,monitored_by,ocm_bind,offshoot,ops,placed_into,policy,recommended_for,restore_into,scaled_by,source,storage,view) +// +kubebuilder:validation:Enum=authn;authz;auth_secret;backup_via;catalog;cert_issuer;config;connect_via;exposed_by;event;located_on;monitored_by;ocm_bind;offshoot;ops;policy;recommended_for;restore_into;scaled_by;source;storage;view +// ENUM(authn,authz,auth_secret,backup_via,catalog,cert_issuer,config,connect_via,exposed_by,event,located_on,monitored_by,ocm_bind,offshoot,ops,policy,recommended_for,restore_into,scaled_by,source,storage,view) type EdgeLabel string func (e EdgeLabel) Direct() bool { diff --git a/vendor/kmodules.xyz/client-go/api/v1/object_enum.go b/vendor/kmodules.xyz/client-go/api/v1/object_enum.go index 65792ec2b..954a1ef8b 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/object_enum.go +++ b/vendor/kmodules.xyz/client-go/api/v1/object_enum.go @@ -42,8 +42,6 @@ const ( EdgeLabelOffshoot EdgeLabel = "offshoot" // EdgeLabelOps is a EdgeLabel of type ops. EdgeLabelOps EdgeLabel = "ops" - // EdgeLabelPlacedInto is a EdgeLabel of type placed_into. - EdgeLabelPlacedInto EdgeLabel = "placed_into" // EdgeLabelPolicy is a EdgeLabel of type policy. EdgeLabelPolicy EdgeLabel = "policy" // EdgeLabelRecommendedFor is a EdgeLabel of type recommended_for. @@ -78,7 +76,6 @@ var _EdgeLabelNames = []string{ string(EdgeLabelOcmBind), string(EdgeLabelOffshoot), string(EdgeLabelOps), - string(EdgeLabelPlacedInto), string(EdgeLabelPolicy), string(EdgeLabelRecommendedFor), string(EdgeLabelRestoreInto), @@ -113,7 +110,6 @@ func EdgeLabelValues() []EdgeLabel { EdgeLabelOcmBind, EdgeLabelOffshoot, EdgeLabelOps, - EdgeLabelPlacedInto, EdgeLabelPolicy, EdgeLabelRecommendedFor, EdgeLabelRestoreInto, @@ -152,7 +148,6 @@ var _EdgeLabelValue = map[string]EdgeLabel{ "ocm_bind": EdgeLabelOcmBind, "offshoot": EdgeLabelOffshoot, "ops": EdgeLabelOps, - "placed_into": EdgeLabelPlacedInto, "policy": EdgeLabelPolicy, "recommended_for": EdgeLabelRecommendedFor, "restore_into": EdgeLabelRestoreInto, diff --git a/vendor/kmodules.xyz/client-go/apiextensions/controller.go b/vendor/kmodules.xyz/client-go/apiextensions/controller.go index 6d3d66a66..771374ffb 100644 --- a/vendor/kmodules.xyz/client-go/apiextensions/controller.go +++ b/vendor/kmodules.xyz/client-go/apiextensions/controller.go @@ -38,11 +38,13 @@ type setupGroup struct { fn SetupFn } +type crdParamKey struct{} + var ( setupFns = make(map[schema.GroupKind]setupGroup) testFns = make(map[schema.GroupKind]TestFn) setupDone = map[schema.GroupKind]bool{} - CRDParam = struct{}{} + CRDParam = crdParamKey{} mu sync.Mutex ) diff --git a/vendor/kmodules.xyz/client-go/meta/preconditions.go b/vendor/kmodules.xyz/client-go/meta/preconditions.go index 5a5f597a5..5dddddb48 100644 --- a/vendor/kmodules.xyz/client-go/meta/preconditions.go +++ b/vendor/kmodules.xyz/client-go/meta/preconditions.go @@ -17,7 +17,7 @@ limitations under the License. package meta import ( - "fmt" + "errors" "strings" "k8s.io/apimachinery/pkg/util/mergepatch" @@ -46,7 +46,7 @@ func (s PreConditionSet) PreconditionFunc() []mergepatch.PreconditionFunc { func (s PreConditionSet) Error() error { strList := strings.Join(sets.List[string](s.Set), "\n\t") - return fmt.Errorf(strings.Join([]string{`At least one of the following was changed: + return errors.New(strings.Join([]string{`At least one of the following was changed: apiVersion kind name diff --git a/vendor/modules.txt b/vendor/modules.txt index 6b6dcb2bc..0de11016c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -957,7 +957,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 @@ -1525,7 +1525,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 @@ -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.0-rc.3 +# kubedb.dev/apimachinery v0.47.0 ## explicit; go 1.22.1 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/catalog