Prepare for release v0.55.0

go.mod

@@ -26,13 +26,13 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.29.0
 	kmodules.xyz/cert-manager-util v0.29.0
-	kmodules.xyz/client-go v0.32.1
+	kmodules.xyz/client-go v0.32.6
 	kmodules.xyz/custom-resources v0.32.0
 	kmodules.xyz/monitoring-agent-api v0.32.0
-	kubedb.dev/apimachinery v0.54.0
-	kubedb.dev/db-client-go v0.9.0
+	kubedb.dev/apimachinery v0.55.0
+	kubedb.dev/db-client-go v0.10.0
 	kubeops.dev/petset v0.0.10
-	sigs.k8s.io/controller-runtime v0.20.3
+	sigs.k8s.io/controller-runtime v0.20.4
 	sigs.k8s.io/yaml v1.4.0
 	stash.appscode.dev/apimachinery v0.39.0
 )
@@ -145,7 +145,7 @@ require (
 	kmodules.xyz/objectstore-api v0.32.0 // indirect
 	kmodules.xyz/offshoot-api v0.32.0 // indirect
 	kmodules.xyz/prober v0.32.0 // indirect
-	kmodules.xyz/resource-metadata v0.26.1 // indirect
+	kmodules.xyz/resource-metadata v0.30.1 // indirect
 	kubeops.dev/csi-driver-cacerts v0.1.0 // indirect
 	kubeops.dev/sidekick v0.0.11 // indirect
 	kubestash.dev/apimachinery v0.18.0 // indirect

go.sum

@@ -688,8 +688,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
 kmodules.xyz/cert-manager-util v0.29.0 h1:HjEaEsv66xeMKiI8LwfTRls0z9V9L0qEvPBdOcX/CsI=
 kmodules.xyz/cert-manager-util v0.29.0/go.mod h1:0YuaPwp+P3Pw7Spxf6eDhOCMDDNXfNV2xIuxIexT1QU=
-kmodules.xyz/client-go v0.32.1 h1:W8TWGBBaokQEqfesbdhlRFMMV0TChcRbMRQ0eTIRS88=
-kmodules.xyz/client-go v0.32.1/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
+kmodules.xyz/client-go v0.32.6 h1:/V9T0aLfe38PsyF+5FeU5QaC3GcqD8hQoWSCZw/uOpI=
+kmodules.xyz/client-go v0.32.6/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
 kmodules.xyz/custom-resources v0.32.0 h1:wzmJTtswO+OmvtqYc70pVoopZyt5UJHKTom4Jh6bfhM=
 kmodules.xyz/custom-resources v0.32.0/go.mod h1:aLFrfbUKS+AkKtxFYWpPGzuLNarRtGlkHwC07APHba8=
 kmodules.xyz/monitoring-agent-api v0.32.0 h1:cMQbWvbTc4JWeLI/zYE0HLefsdFYBzqvATLx16qCzxo=
@@ -700,12 +700,12 @@ kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o
 kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
 kmodules.xyz/prober v0.32.0 h1:8Z6pFRAu8kP0wwX2BooPCRy2SE6ZkUMHQmZDH5VUEGY=
 kmodules.xyz/prober v0.32.0/go.mod h1:h0fH4m9DaIwuNZq85zOlWUvBycyy4LvCPMUUhpS3iSE=
-kmodules.xyz/resource-metadata v0.26.1 h1:FKxvM8v5GkWWAnLHwnHGZNgewzNtKO7SDP+mRTA6M4g=
-kmodules.xyz/resource-metadata v0.26.1/go.mod h1:E4scoxcEgd7NGLU69IiS0Qh+KnwYQ/ckZtDyA8ydZKs=
-kubedb.dev/apimachinery v0.54.0 h1:uLsJ8Wrscl56X7Hz2Mm+1IprSTjaiTeExM1f/JgjcoM=
-kubedb.dev/apimachinery v0.54.0/go.mod h1:ahpVjA0+WyTcXfgUE5qiSahzdWu/eIqpcRJcthWs8TM=
-kubedb.dev/db-client-go v0.9.0 h1:UCrpZB8ggo9+pms9hjcg7Qw3AMkNfKJrwsOMnzT624g=
-kubedb.dev/db-client-go v0.9.0/go.mod h1:x0niEtxEWuAcTn7u4VRjcdL4hKegMyvoTpbhQHtW5yQ=
+kmodules.xyz/resource-metadata v0.30.1 h1:JPxjOfAYj/1VM5FONg90s99LV7ZPHh7ivaavS3Bpkr0=
+kmodules.xyz/resource-metadata v0.30.1/go.mod h1:GgA+AL58S2PlukBcnD8P6ILTtIJlp6wVuUyphR67LCY=
+kubedb.dev/apimachinery v0.55.0 h1:n4DfJqW6fDFxU9/rlmzPfk8BDHkA8v+HK58lLTenPu0=
+kubedb.dev/apimachinery v0.55.0/go.mod h1:/GY1pDR/Y9C1qY83KI9DBHLS+JFO/TYq4zLxk/+UJy0=
+kubedb.dev/db-client-go v0.10.0 h1:GaSUSwVc6Obheaml6WjUZt51IbjzpdA/xRyR5Fngn40=
+kubedb.dev/db-client-go v0.10.0/go.mod h1:9u/2xw+xxN0yPEEmyOOcnVzWggnYPJPrSkvjdc3vs6o=
 kubeops.dev/csi-driver-cacerts v0.1.0 h1:WDgKNo5QAiMoVy4c/4ARWeCXJbqdcXdcn8VLImV4VZU=
 kubeops.dev/csi-driver-cacerts v0.1.0/go.mod h1:5a/ZOn5LFw26PPBpTKvsivBjcvVArOrJX24C+k+przk=
 kubeops.dev/petset v0.0.10 h1:sNaqmHrD9bW7pcrWnwPoiQrKvdRwRX0BaRQc5QA78Bg=

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

@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//go:generate go-enum --mustparse --names --values
 package v1
 
 import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
-	"strings"
 )
 
 // +kubebuilder:validation:Enum=AKS;DigitalOcean;EKS;Exoscale;Generic;GKE;Linode;Packet;Rancher;Scaleway;Vultr
@@ -57,29 +57,33 @@ const (
 	ClusterNameKey         string = "cluster.appscode.com/name"
 	ClusterDisplayNameKey  string = "cluster.appscode.com/display-name"
 	ClusterProviderNameKey string = "cluster.appscode.com/provider"
+	ClusterModeKey         string = "cluster.appscode.com/mode"
 	ClusterProfileLabel    string = "cluster.appscode.com/profile"
 
-	AceOrgIDKey            string = "ace.appscode.com/org-id"
-	ClientOrgKey           string = "ace.appscode.com/client-org"
-	ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
-	ClientKeyPrefix        string = "client.ace.appscode.com/"
+	AceOrgIDKey               string = "ace.appscode.com/org-id"
+	AceEnableResourceTrialKey string = "ace.appscode.com/enable-resource-trial"
+	ClientOrgKey              string = "ace.appscode.com/client-org"
+	ClientOrgMonitoringKey    string = "ace.appscode.com/client-org-monitoring"
+	ClientKeyPrefix           string = "client.ace.appscode.com/"
 
 	ClusterClaimKeyID       string = "id.k8s.io"
 	ClusterClaimKeyInfo     string = "cluster.ace.info"
 	ClusterClaimKeyFeatures string = "features.ace.info"
 )
 
 type ClusterMetadata struct {
-	UID          string          `json:"uid" protobuf:"bytes,1,opt,name=uid"`
-	Name         string          `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
-	DisplayName  string          `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
-	Provider     HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
-	OwnerID      string          `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
-	OwnerType    string          `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
-	APIEndpoint  string          `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
-	CABundle     string          `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
-	ManagerID    string          `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"`
-	HubClusterID string          `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"`
+	UID                  string          `json:"uid" protobuf:"bytes,1,opt,name=uid"`
+	Name                 string          `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
+	DisplayName          string          `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
+	Provider             HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
+	OwnerID              string          `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
+	OwnerType            string          `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
+	APIEndpoint          string          `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
+	CABundle             string          `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
+	ManagerID            string          `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"`
+	HubClusterID         string          `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"`
+	CloudServiceAuthMode string          `json:"cloudServiceAuthMode,omitempty" protobuf:"bytes,11,opt,name=cloudServiceAuthMode"`
+	Mode                 ClusterMode     `json:"mode,omitempty" protobuf:"bytes,12,opt,name=mode,casttype=ClusterMode"`
 }
 
 func (md ClusterMetadata) Manager() string {
@@ -96,88 +100,17 @@ func (md ClusterMetadata) State() string {
 	return base64.URLEncoding.EncodeToString(hasher.Sum(nil))
 }
 
-/*
-ENUM(
-
-	ACE                         = 1
-	OCMHub                      = 2
-	OCMMulticlusterControlplane = 4
-	OCMSpoke                    = 8
-	OpenShift                   = 16
-	Rancher                     = 32
-	VirtualCluster              = 64
-
-)
-*/
-type ClusterManager int
-
-const (
-	ClusterManagerACE ClusterManager = 1 << iota
-	ClusterManagerOCMHub
-	ClusterManagerOCMMulticlusterControlplane
-	ClusterManagerOCMSpoke
-	ClusterManagerOpenShift
-	ClusterManagerRancher
-	ClusterManagerVirtualCluster
-)
-
-func (cm ClusterManager) ManagedByACE() bool {
-	return cm&ClusterManagerACE == ClusterManagerACE
-}
-
-func (cm ClusterManager) ManagedByOCMHub() bool {
-	return cm&ClusterManagerOCMHub == ClusterManagerOCMHub
-}
-
-func (cm ClusterManager) ManagedByOCMSpoke() bool {
-	return cm&ClusterManagerOCMSpoke == ClusterManagerOCMSpoke
-}
-
-func (cm ClusterManager) ManagedByOCMMulticlusterControlplane() bool {
-	return cm&ClusterManagerOCMMulticlusterControlplane == ClusterManagerOCMMulticlusterControlplane
-}
+// +kubebuilder:validation:Enum=prod;qa;staging;dev
+// ENUM(prod,qa,staging,dev)
+type ClusterMode string
 
-func (cm ClusterManager) ManagedByRancher() bool {
-	return cm&ClusterManagerRancher == ClusterManagerRancher
-}
-
-func (cm ClusterManager) ManagedByOpenShift() bool {
-	return cm&ClusterManagerOpenShift == ClusterManagerOpenShift
-}
-
-func (cm ClusterManager) ManagedByVirtualCluster() bool {
-	return cm&ClusterManagerVirtualCluster == ClusterManagerVirtualCluster
-}
-
-func (cm ClusterManager) Strings() []string {
-	out := make([]string, 0, 7)
-	if cm.ManagedByACE() {
-		out = append(out, "ACE")
-	}
-	if cm.ManagedByOCMHub() {
-		out = append(out, "OCMHub")
-	}
-	if cm.ManagedByOCMSpoke() {
-		out = append(out, "OCMSpoke")
-	}
-	if cm.ManagedByOCMMulticlusterControlplane() {
-		out = append(out, "OCMMulticlusterControlplane")
-	}
-	if cm.ManagedByRancher() {
-		out = append(out, "Rancher")
-	}
-	if cm.ManagedByOpenShift() {
-		out = append(out, "OpenShift")
-	}
-	if cm.ManagedByVirtualCluster() {
-		out = append(out, "vcluster")
-	}
-	return out
-}
-
-func (cm ClusterManager) String() string {
-	return strings.Join(cm.Strings(), ",")
-}
+//
+//const (
+//	ClusterModeProd    ClusterMode = "prod"
+//	ClusterModeQA      ClusterMode = "qa"
+//	ClusterModeStaging ClusterMode = "staging"
+//	ClusterModeDev     ClusterMode = "dev"
+//)
 
 type CAPIClusterInfo struct {
 	Provider    CAPIProvider `json:"provider" protobuf:"bytes,1,opt,name=provider,casttype=CAPIProvider"`
@@ -206,11 +139,11 @@ const (
 )
 
 type ClusterClaimInfo struct {
-	ClusterMetadata ClusterInfo `json:"clusterMetadata"`
+	ClusterMetadata ClusterInfo `json:"clusterMetadata" protobuf:"bytes,1,opt,name=clusterMetadata"`
 }
 
 type ClusterClaimFeatures struct {
-	EnabledFeatures           []string `json:"enabledFeatures,omitempty"`
-	ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty"`
-	DisabledFeatures          []string `json:"disabledFeatures,omitempty"`
+	EnabledFeatures           []string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,rep,name=enabledFeatures"`
+	ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,rep,name=externallyManagedFeatures"`
+	DisabledFeatures          []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,rep,name=disabledFeatures"`
 }