Skip to content

Commit bc1b92c

Browse files
authored
Prepare for release v0.4.0-rc.0 (#150)
ProductLine: KubeDB Release: v2024.11.8-rc.0 Release-tracker: kubedb/CHANGELOG#100 Signed-off-by: 1gtm <[email protected]>
1 parent e821040 commit bc1b92c

37 files changed

+828
-161
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ require (
3030
k8s.io/api v0.30.2
3131
k8s.io/apimachinery v0.30.2
3232
k8s.io/klog/v2 v2.130.1
33-
kmodules.xyz/client-go v0.30.28
33+
kmodules.xyz/client-go v0.30.32
3434
kmodules.xyz/custom-resources v0.30.0
35-
kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1
35+
kubedb.dev/apimachinery v0.49.0-rc.0
3636
sigs.k8s.io/controller-runtime v0.18.4
3737
xorm.io/xorm v1.3.6
3838
)
@@ -43,7 +43,7 @@ require (
4343
github.com/andybalholm/brotli v1.1.0 // indirect
4444
github.com/beorn7/perks v1.0.1 // indirect
4545
github.com/blang/semver/v4 v4.0.0 // indirect
46-
github.com/cert-manager/cert-manager v1.15.1 // indirect
46+
github.com/cert-manager/cert-manager v1.15.2 // indirect
4747
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4848
github.com/coreos/go-semver v0.3.1 // indirect
4949
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
5959
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
6060
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
6161
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
62-
github.com/cert-manager/cert-manager v1.15.1 h1:HSG4k2GlJ2YgTLkZfQzrArNaQpM9+ehDDg550IxAD94=
63-
github.com/cert-manager/cert-manager v1.15.1/go.mod h1:p98JoGv3J9JhdKU9ngsj2EhWGI6/GlU7kpjWu5lf2js=
62+
github.com/cert-manager/cert-manager v1.15.2 h1:Mjbvc+FjYeg2928xy7bcS+c+ARxyqBcXM9QypOg1/Uo=
63+
github.com/cert-manager/cert-manager v1.15.2/go.mod h1:stBge/DTvrhfQMB/93+Y62s+gQgZBsfL1o0C/4AL/mI=
6464
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
6565
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
6666
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -796,16 +796,16 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI
796796
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
797797
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
798798
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
799-
kmodules.xyz/client-go v0.30.28 h1:YD5AZaUm3xakIbwLoKblLbE6mvayNZhIomgdXyuLo40=
800-
kmodules.xyz/client-go v0.30.28/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
799+
kmodules.xyz/client-go v0.30.32 h1:y1qb4IJwYdkROLcc7e0UcJSDj8D2YeLsawAWHnCF+JU=
800+
kmodules.xyz/client-go v0.30.32/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
801801
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
802802
kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
803803
kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+aYy2EiKaw=
804804
kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
805805
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
806806
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
807-
kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1 h1:wSfneVFQ57FYIpV+XHA3xsfi8cCr4fWUSKetlI9AlIM=
808-
kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1/go.mod h1:NCiS4uS+F8DUyU9/tUQO3wqyNRNf0busab5/0Q2nYA0=
807+
kubedb.dev/apimachinery v0.49.0-rc.0 h1:7WLTSSoXEb8trDFW5AcDxfYJxX7j5TQU2OYijLgAfTc=
808+
kubedb.dev/apimachinery v0.49.0-rc.0/go.mod h1:l3sl+LZXvllja1xbZTgmzHNY7hQGK/uLXjkSothH5ns=
809809
kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
810810
kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
811811
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=

vendor/github.com/cert-manager/cert-manager/LICENSES

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/client-go/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
5656
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
5757

5858
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
59-
BASEIMAGE_DBG ?= debian:bookworm
59+
BASEIMAGE_DBG ?= debian:12
6060

6161
GO_VERSION ?= 1.23
6262
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)

vendor/kmodules.xyz/client-go/api/v1/cluster.go

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,34 @@ const (
4747
ClusterNameKey string = "cluster.appscode.com/name"
4848
ClusterDisplayNameKey string = "cluster.appscode.com/display-name"
4949
ClusterProviderNameKey string = "cluster.appscode.com/provider"
50+
51+
ClientOrgKey string = "ace.appscode.com/client-org"
52+
ClientKeyPrefix string = "client.ace.appscode.com/"
5053
)
5154

5255
type ClusterMetadata struct {
53-
UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
54-
Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
55-
DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
56-
Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
57-
OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
58-
OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
59-
APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
60-
CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
56+
UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
57+
Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
58+
DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
59+
Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
60+
OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
61+
OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
62+
APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
63+
CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
64+
ManagerID string `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"`
65+
HubClusterID string `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"`
66+
}
67+
68+
func (md ClusterMetadata) Manager() string {
69+
if md.ManagerID != "" && md.ManagerID != "0" {
70+
return md.ManagerID
71+
}
72+
return md.OwnerID
6173
}
6274

6375
func (md ClusterMetadata) State() string {
6476
hasher := hmac.New(sha256.New, []byte(md.UID))
65-
state := fmt.Sprintf("%s,%s", md.APIEndpoint, md.OwnerID)
77+
state := fmt.Sprintf("%s,%s", md.APIEndpoint, md.Manager())
6678
hasher.Write([]byte(state))
6779
return base64.URLEncoding.EncodeToString(hasher.Sum(nil))
6880
}

0 commit comments

Comments
 (0)