Merge branch 'master' into add_expander_stage_logging

GoogleCloudPlatform · Jun 29, 2024 · 970d833 · 970d833
2 parents baf56d1 + 14966c3
commit 970d833
Show file tree

Hide file tree

Showing 295 changed files with 39,386 additions and 10,153 deletions.
diff --git a/README.NewResourceFromTerraform.md b/README.NewResourceFromTerraform.md
@@ -180,6 +180,8 @@ ServiceMappings file. Add the `ResourceConfig` for your resource:
     1.  Set `v1alpha1ToV1beta1` to `true`.
     1.  Set `storageVersion` to `v1alpha1`.
 
+    > NOTE: For [autogenereated resources](https://github.com/GoogleCloudPlatform/k8s-config-connector/tree/2f4f2c6ee65034f7bbb4b4f62d2ba15842ff114d/scripts/resource-autogen/generated/servicemappings), don't remove the service mappings. Instead copy the content or the file over to [config/servicemappings/](https://github.com/GoogleCloudPlatform/k8s-config-connector/tree/v1.119.0/config/servicemappings).
+
 1.  Ensure the `autoGenerated` field is unset.
 
 1.  Add `resourceID` if the resource has the resource ID. The value of

diff --git a/apis/cloudbuild/v1alpha1/conversion.go b/apis/cloudbuild/v1alpha1/conversion.go
diff --git a/apis/cloudbuild/v1alpha1/workerpool_types.go b/apis/cloudbuild/v1alpha1/workerpool_types.go
diff --git a/...loudbuild/v1alpha1/generated_expansion.go → apis/cloudbuild/v1beta1/doc.go b/...loudbuild/v1alpha1/generated_expansion.go → apis/cloudbuild/v1beta1/doc.go
@@ -1,24 +1,17 @@
-// Copyright 2020 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//    http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// *** DISCLAIMER ***
-// Config Connector's go-client for CRDs is currently in ALPHA, which means
-// that future versions of the go-client may include breaking changes.
-// Please try it out and give us feedback!
+// +kcc:proto=google.devtools.cloudbuild.v1
 
-// Code generated by main. DO NOT EDIT.
-
-package v1alpha1
-
-type CloudBuildWorkerPoolExpansion interface{}
+package v1beta1
diff --git a/.../cloudbuild/v1alpha1/groupversion_info.go → apis/cloudbuild/v1beta1/groupversion_info.go b/.../cloudbuild/v1alpha1/groupversion_info.go → apis/cloudbuild/v1beta1/groupversion_info.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the cloudbuild v1alpha1 API group
+// Package v1beta1 contains API Schema definitions for the cloudbuild v1beta1 API group
 // +kubebuilder:object:generate=true
 // +groupName=cloudbuild.cnrm.cloud.google.com
-package v1alpha1
+package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "cloudbuild.cnrm.cloud.google.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "cloudbuild.cnrm.cloud.google.com", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}