resolve merge conflict

GoogleCloudPlatform · Jun 2, 2024 · cd1d9f2 · cd1d9f2
1 parent b588d2a
commit cd1d9f2
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 16 deletions.
diff --git a/apis/apikeys/v1alpha1/apikey_type.go b/apis/apikeys/v1alpha1/apikey_type.go
@@ -41,7 +41,7 @@ var (
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=gcp,shortName=gcpapikeyskey;gcpapikeyskeys
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/directcrd=true";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=alpha";"cnrm.cloud.google.com/system=true"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/tf2crd=true";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=alpha";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
 // +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
 // +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"

diff --git a/apis/resources/logging/v1beta1/logmetric_types.go b/apis/resources/logging/v1beta1/logmetric_types.go
@@ -233,7 +233,7 @@ type LoggingLogMetricStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/directcrd=true";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
 // +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
 // +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"

diff --git a/...ensions.k8s.io_v1_customresourcedefinition_apikeyskeys.apikeys.cnrm.cloud.google.com.yaml b/...ensions.k8s.io_v1_customresourcedefinition_apikeyskeys.apikeys.cnrm.cloud.google.com.yaml
@@ -5,10 +5,10 @@ metadata:
     cnrm.cloud.google.com/version: 0.0.0-dev
   creationTimestamp: null
   labels:
-    cnrm.cloud.google.com/directcrd: "true"
     cnrm.cloud.google.com/managed-by-kcc: "true"
     cnrm.cloud.google.com/stability-level: alpha
     cnrm.cloud.google.com/system: "true"
+    cnrm.cloud.google.com/tf2crd: "true"
   name: apikeyskeys.apikeys.cnrm.cloud.google.com
 spec:
   group: apikeys.cnrm.cloud.google.com

diff --git a/...s.k8s.io_v1_customresourcedefinition_logginglogmetrics.logging.cnrm.cloud.google.com.yaml b/...s.k8s.io_v1_customresourcedefinition_logginglogmetrics.logging.cnrm.cloud.google.com.yaml
@@ -5,7 +5,6 @@ metadata:
     cnrm.cloud.google.com/version: 0.0.0-dev
   creationTimestamp: null
   labels:
-    cnrm.cloud.google.com/directcrd: "true"
     cnrm.cloud.google.com/managed-by-kcc: "true"
     cnrm.cloud.google.com/stability-level: stable
     cnrm.cloud.google.com/system: "true"

diff --git a/experiments/compositions/composition/proto/expander.pb.go b/experiments/compositions/composition/proto/expander.pb.go
diff --git a/experiments/compositions/composition/proto/expander_grpc.pb.go b/experiments/compositions/composition/proto/expander_grpc.pb.go
diff --git a/pkg/clients/generated/apis/apikeys/v1alpha1/apikeyskey_types.go b/pkg/clients/generated/apis/apikeys/v1alpha1/apikeyskey_types.go
diff --git a/pkg/clients/generated/apis/cloudbuild/v1beta1/cloudbuildworkerpool_types.go b/pkg/clients/generated/apis/cloudbuild/v1beta1/cloudbuildworkerpool_types.go
diff --git a/pkg/clients/generated/apis/cloudbuild/v1beta1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/cloudbuild/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/clients/generated/apis/logging/v1beta1/logginglogmetric_types.go b/pkg/clients/generated/apis/logging/v1beta1/logginglogmetric_types.go
diff --git a/pkg/controller/direct/cloudbuild/workerpool_controller.go b/pkg/controller/direct/cloudbuild/workerpool_controller.go
@@ -39,20 +39,18 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
 func init() {
-	directbase.ControllerBuilder.Register(krm.GroupVersionKind, AddCloudBuildWorkerPoolController)
+	directbase.ControllerBuilder.RegisterModel(krm.GroupVersionKind, NewModel)
 }
 
-const ctrlName = "cloudbuild-controller"
-
-// AddCloudBuildWorkerPoolController creates a new controller and adds it to the Manager.
-func AddCloudBuildWorkerPoolController(mgr manager.Manager, config *controller.Config, opts directbase.Deps) error {
-	return directbase.Add(mgr, krm.GroupVersionKind, &model{config: config}, opts)
+func NewModel(config *controller.Config) directbase.Model {
+	return &model{config: config}
 }
 
+const ctrlName = "cloudbuild-controller"
+
 var _ directbase.Model = &model{}
 
 type model struct {