kptdev · droot · Jan 25, 2023 · Jan 25, 2023
diff --git a/internal/testutil/pkgbuilder/builder_test.go b/internal/testutil/pkgbuilder/builder_test.go
@@ -1,3 +1,17 @@
+// Copyright 2023 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
+//
+// 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.
+
 package pkgbuilder
 
 import (

diff --git a/rollouts/api/v1alpha1/rollout_types.go b/rollouts/api/v1alpha1/rollout_types.go
@@ -20,14 +20,16 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // RolloutSpec defines the desired state of Rollout
 type RolloutSpec struct {
 	// Description is a user friendly description of this Rollout.
 	Description string `json:"description,omitempty"`
 
+	// Clusters specifies the source for discovering the clusters.
+	Clusters ClusterDiscovery `json:"clusters"`
+
 	// Packages source for this Rollout.
 	Packages PackagesConfig `json:"packages"`
 
@@ -51,6 +53,20 @@ type ClusterRef struct {
 	Name string `json:"name"`
 }
 
+// different types of cluster sources
+const (
+	KCC      ClusterSourceType = "KCC"
+	GCPFleet ClusterSourceType = "GCPFleet"
+)
+
+// +kubebuilder:validation:Enum=KCC;GCPFleet
+type ClusterSourceType string
+
+// ClusterDiscovery represents configuration needed to discover clusters.
+type ClusterDiscovery struct {
+	SourceType ClusterSourceType `json:"sourceType"`
+}
+
 const (
 	GitHub PackageSourceType = "GitHub"
 )

diff --git a/rollouts/api/v1alpha1/zz_generated.deepcopy.go b/rollouts/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/rollouts/config/crd/bases/gitops.kpt.dev_rollouts.yaml b/rollouts/config/crd/bases/gitops.kpt.dev_rollouts.yaml
@@ -49,6 +49,17 @@ spec:
           spec:
             description: RolloutSpec defines the desired state of Rollout
             properties:
+              clusters:
+                description: Clusters specifies the source for discovering the clusters.
+                properties:
+                  sourceType:
+                    enum:
+                    - KCC
+                    - GCPFleet
+                    type: string
+                required:
+                - sourceType
+                type: object
               description:
                 description: Description is a user friendly description of this Rollout.
                 type: string
@@ -211,6 +222,7 @@ spec:
                     x-kubernetes-map-type: atomic
                 type: object
             required:
+            - clusters
             - packageToTargetMatcher
             - packages
             - strategy

diff --git a/rollouts/config/samples/gitops_rollout_cert_manager.yaml b/rollouts/config/samples/gitops_rollout_cert_manager.yaml
@@ -18,6 +18,8 @@ metadata:
   name: cert-manager-rollout
 spec:
   description: kpt samples rollout
+  clusters:
+    sourceType: KCC
   packages:
     sourceType: GitHub
     github:

diff --git a/rollouts/config/samples/gitops_rollout_cert_manager_progressive.yaml b/rollouts/config/samples/gitops_rollout_cert_manager_progressive.yaml
@@ -18,6 +18,8 @@ metadata:
   name: cm-progressive
 spec:
   description: kpt samples rollout
+  clusters:
+    sourceType: KCC
   packages:
     sourceType: GitHub
     github:

diff --git a/rollouts/config/samples/gitops_rollout_kpt_samples.yaml b/rollouts/config/samples/gitops_rollout_kpt_samples.yaml
@@ -18,6 +18,8 @@ metadata:
   name: rollout-kpt-samples
 spec:
   description: kpt samples rollout
+  clusters:
+    sourceType: KCC
   packages:
     sourceType: GitHub
     github:

diff --git a/rollouts/config/samples/gitops_rollout_oahu.yaml b/rollouts/config/samples/gitops_rollout_oahu.yaml
@@ -18,6 +18,8 @@ metadata:
   name: rollout-oahu
 spec:
   description: oahu rollout
+  clusters:
+    sourceType: KCC
   packages:
     sourceType: GitHub
     github:

diff --git a/rollouts/config/samples/gitops_rollout_repo_selector.yaml b/rollouts/config/samples/gitops_rollout_repo_selector.yaml
@@ -18,6 +18,8 @@ metadata:
   name: rollout-repo-selector
 spec:
   description: repo selector rollout
+  clusters:
+    sourceType: KCC
   packages:
     sourceType: GitHub
     github:

diff --git a/tools/licensescan/licensedb_test.go b/tools/licensescan/licensedb_test.go
@@ -1,3 +1,17 @@
+// Copyright 2023 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
+//
+// 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.
+
 package main
 
 import (