Skip to content

Commit 999446c

Browse files
1gtm1gtm
authored
Prepare for release v0.10.0 (#180)
ProductLine: KubeDB Release: v2025.5.30 Release-tracker: kubedb/CHANGELOG#113 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 0c50149 commit 999446c

File tree

11 files changed

+1278
-314
lines changed

11 files changed

+1278
-314
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ require (
3535
k8s.io/api v0.32.3
3636
k8s.io/apimachinery v0.32.3
3737
k8s.io/klog/v2 v2.130.1
38-
kmodules.xyz/client-go v0.32.1
38+
kmodules.xyz/client-go v0.32.6
3939
kmodules.xyz/custom-resources v0.32.0
40-
kubedb.dev/apimachinery v0.54.1-0.20250529064949-e9f8cabaac99
41-
sigs.k8s.io/controller-runtime v0.20.3
40+
kubedb.dev/apimachinery v0.55.0
41+
sigs.k8s.io/controller-runtime v0.20.4
4242
xorm.io/xorm v1.3.9
4343
)
4444

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,16 +538,16 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
538538
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
539539
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
540540
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
541-
kmodules.xyz/client-go v0.32.1 h1:W8TWGBBaokQEqfesbdhlRFMMV0TChcRbMRQ0eTIRS88=
542-
kmodules.xyz/client-go v0.32.1/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
541+
kmodules.xyz/client-go v0.32.6 h1:/V9T0aLfe38PsyF+5FeU5QaC3GcqD8hQoWSCZw/uOpI=
542+
kmodules.xyz/client-go v0.32.6/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
543543
kmodules.xyz/custom-resources v0.32.0 h1:wzmJTtswO+OmvtqYc70pVoopZyt5UJHKTom4Jh6bfhM=
544544
kmodules.xyz/custom-resources v0.32.0/go.mod h1:aLFrfbUKS+AkKtxFYWpPGzuLNarRtGlkHwC07APHba8=
545545
kmodules.xyz/monitoring-agent-api v0.32.0 h1:cMQbWvbTc4JWeLI/zYE0HLefsdFYBzqvATLx16qCzxo=
546546
kmodules.xyz/monitoring-agent-api v0.32.0/go.mod h1:zgRKiJcuK7FOHy0Y1TsONRbJfgnPCs8t4Zh/6Afr+yU=
547547
kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
548548
kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
549-
kubedb.dev/apimachinery v0.54.1-0.20250529064949-e9f8cabaac99 h1:E6dltibiZOpTyy+QtaH2B2aKwiCsTHzuspdXdX8sKnc=
550-
kubedb.dev/apimachinery v0.54.1-0.20250529064949-e9f8cabaac99/go.mod h1:ahpVjA0+WyTcXfgUE5qiSahzdWu/eIqpcRJcthWs8TM=
549+
kubedb.dev/apimachinery v0.55.0 h1:n4DfJqW6fDFxU9/rlmzPfk8BDHkA8v+HK58lLTenPu0=
550+
kubedb.dev/apimachinery v0.55.0/go.mod h1:/GY1pDR/Y9C1qY83KI9DBHLS+JFO/TYq4zLxk/+UJy0=
551551
kubeops.dev/petset v0.0.10 h1:sNaqmHrD9bW7pcrWnwPoiQrKvdRwRX0BaRQc5QA78Bg=
552552
kubeops.dev/petset v0.0.10/go.mod h1:uHL83kggwmtSxdlIfxNbY2isV22iYV6YjADv0y+Z7YA=
553553
kubeops.dev/sidekick v0.0.11 h1:OydXdIH6cYSiWxKIWvrywk95WhhHSERkc7RNPOmTekc=

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

Lines changed: 33 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
//go:generate go-enum --mustparse --names --values
1718
package v1
1819

1920
import (
2021
"crypto/hmac"
2122
"crypto/sha256"
2223
"encoding/base64"
2324
"fmt"
24-
"strings"
2525
)
2626

2727
// +kubebuilder:validation:Enum=AKS;DigitalOcean;EKS;Exoscale;Generic;GKE;Linode;Packet;Rancher;Scaleway;Vultr
@@ -57,29 +57,33 @@ const (
5757
ClusterNameKey string = "cluster.appscode.com/name"
5858
ClusterDisplayNameKey string = "cluster.appscode.com/display-name"
5959
ClusterProviderNameKey string = "cluster.appscode.com/provider"
60+
ClusterModeKey string = "cluster.appscode.com/mode"
6061
ClusterProfileLabel string = "cluster.appscode.com/profile"
6162

62-
AceOrgIDKey string = "ace.appscode.com/org-id"
63-
ClientOrgKey string = "ace.appscode.com/client-org"
64-
ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
65-
ClientKeyPrefix string = "client.ace.appscode.com/"
63+
AceOrgIDKey string = "ace.appscode.com/org-id"
64+
AceEnableResourceTrialKey string = "ace.appscode.com/enable-resource-trial"
65+
ClientOrgKey string = "ace.appscode.com/client-org"
66+
ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
67+
ClientKeyPrefix string = "client.ace.appscode.com/"
6668

6769
ClusterClaimKeyID string = "id.k8s.io"
6870
ClusterClaimKeyInfo string = "cluster.ace.info"
6971
ClusterClaimKeyFeatures string = "features.ace.info"
7072
)
7173

7274
type ClusterMetadata struct {
73-
UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
74-
Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
75-
DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
76-
Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
77-
OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
78-
OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
79-
APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
80-
CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
81-
ManagerID string `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"`
82-
HubClusterID string `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"`
75+
UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
76+
Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
77+
DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
78+
Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
79+
OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
80+
OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
81+
APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
82+
CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
83+
ManagerID string `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"`
84+
HubClusterID string `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"`
85+
CloudServiceAuthMode string `json:"cloudServiceAuthMode,omitempty" protobuf:"bytes,11,opt,name=cloudServiceAuthMode"`
86+
Mode ClusterMode `json:"mode,omitempty" protobuf:"bytes,12,opt,name=mode,casttype=ClusterMode"`
8387
}
8488

8589
func (md ClusterMetadata) Manager() string {
@@ -96,88 +100,17 @@ func (md ClusterMetadata) State() string {
96100
return base64.URLEncoding.EncodeToString(hasher.Sum(nil))
97101
}
98102

99-
/*
100-
ENUM(
101-
102-
ACE = 1
103-
OCMHub = 2
104-
OCMMulticlusterControlplane = 4
105-
OCMSpoke = 8
106-
OpenShift = 16
107-
Rancher = 32
108-
VirtualCluster = 64
109-
110-
)
111-
*/
112-
type ClusterManager int
113-
114-
const (
115-
ClusterManagerACE ClusterManager = 1 << iota
116-
ClusterManagerOCMHub
117-
ClusterManagerOCMMulticlusterControlplane
118-
ClusterManagerOCMSpoke
119-
ClusterManagerOpenShift
120-
ClusterManagerRancher
121-
ClusterManagerVirtualCluster
122-
)
123-
124-
func (cm ClusterManager) ManagedByACE() bool {
125-
return cm&ClusterManagerACE == ClusterManagerACE
126-
}
127-
128-
func (cm ClusterManager) ManagedByOCMHub() bool {
129-
return cm&ClusterManagerOCMHub == ClusterManagerOCMHub
130-
}
131-
132-
func (cm ClusterManager) ManagedByOCMSpoke() bool {
133-
return cm&ClusterManagerOCMSpoke == ClusterManagerOCMSpoke
134-
}
135-
136-
func (cm ClusterManager) ManagedByOCMMulticlusterControlplane() bool {
137-
return cm&ClusterManagerOCMMulticlusterControlplane == ClusterManagerOCMMulticlusterControlplane
138-
}
103+
// +kubebuilder:validation:Enum=prod;qa;staging;dev
104+
// ENUM(prod,qa,staging,dev)
105+
type ClusterMode string
139106

140-
func (cm ClusterManager) ManagedByRancher() bool {
141-
return cm&ClusterManagerRancher == ClusterManagerRancher
142-
}
143-
144-
func (cm ClusterManager) ManagedByOpenShift() bool {
145-
return cm&ClusterManagerOpenShift == ClusterManagerOpenShift
146-
}
147-
148-
func (cm ClusterManager) ManagedByVirtualCluster() bool {
149-
return cm&ClusterManagerVirtualCluster == ClusterManagerVirtualCluster
150-
}
151-
152-
func (cm ClusterManager) Strings() []string {
153-
out := make([]string, 0, 7)
154-
if cm.ManagedByACE() {
155-
out = append(out, "ACE")
156-
}
157-
if cm.ManagedByOCMHub() {
158-
out = append(out, "OCMHub")
159-
}
160-
if cm.ManagedByOCMSpoke() {
161-
out = append(out, "OCMSpoke")
162-
}
163-
if cm.ManagedByOCMMulticlusterControlplane() {
164-
out = append(out, "OCMMulticlusterControlplane")
165-
}
166-
if cm.ManagedByRancher() {
167-
out = append(out, "Rancher")
168-
}
169-
if cm.ManagedByOpenShift() {
170-
out = append(out, "OpenShift")
171-
}
172-
if cm.ManagedByVirtualCluster() {
173-
out = append(out, "vcluster")
174-
}
175-
return out
176-
}
177-
178-
func (cm ClusterManager) String() string {
179-
return strings.Join(cm.Strings(), ",")
180-
}
107+
//
108+
//const (
109+
// ClusterModeProd ClusterMode = "prod"
110+
// ClusterModeQA ClusterMode = "qa"
111+
// ClusterModeStaging ClusterMode = "staging"
112+
// ClusterModeDev ClusterMode = "dev"
113+
//)
181114

182115
type CAPIClusterInfo struct {
183116
Provider CAPIProvider `json:"provider" protobuf:"bytes,1,opt,name=provider,casttype=CAPIProvider"`
@@ -206,11 +139,11 @@ const (
206139
)
207140

208141
type ClusterClaimInfo struct {
209-
ClusterMetadata ClusterInfo `json:"clusterMetadata"`
142+
ClusterMetadata ClusterInfo `json:"clusterMetadata" protobuf:"bytes,1,opt,name=clusterMetadata"`
210143
}
211144

212145
type ClusterClaimFeatures struct {
213-
EnabledFeatures []string `json:"enabledFeatures,omitempty"`
214-
ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty"`
215-
DisabledFeatures []string `json:"disabledFeatures,omitempty"`
146+
EnabledFeatures []string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,rep,name=enabledFeatures"`
147+
ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,rep,name=externallyManagedFeatures"`
148+
DisabledFeatures []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,rep,name=disabledFeatures"`
216149
}

‎vendor/kmodules.xyz/client-go/api/v1/cluster_enum.go‎

Lines changed: 62 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)