[csc] Update CSC version from v1 to v2

deploy/crds/operators_v1_catalogsourceconfig_crd.yaml → deploy/crds/operators_v2_catalogsourceconfig_crd.yaml

@@ -15,7 +15,14 @@ spec:
     shortNames:
     - csc
   scope: Namespaced
-  version: v1
+  version: v2
+  versions:
+  - name: v2
+    served: true
+    storage: true
+  - name: v1
+    served: true
+    storage: false
   additionalPrinterColumns:
   - name: Status
     type: string

deploy/upstream/02_catalogsourceconfig.crd.yaml

@@ -15,7 +15,14 @@ spec:
     shortNames:
     - csc
   scope: Namespaced
-  version: v1
+  version: v2
+  versions:
+  - name: v2
+    served: true
+    storage: true
+  - name: v1
+    served: true
+    storage: false
   additionalPrinterColumns:
   - name: Status
     type: string

hack/boilerplate.go.txt

@@ -0,0 +1,15 @@
+/*
+Copyright The Kubernetes Authors.
+
+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.
+*/

manifests/02_catalogsourceconfig.crd.yaml

@@ -15,7 +15,14 @@ spec:
     shortNames:
     - csc
   scope: Namespaced
-  version: v1
+  version: v2
+  versions:
+  - name: v2
+    served: true
+    storage: true
+  - name: v1
+    served: true
+    storage: false
   additionalPrinterColumns:
   - name: Status
     type: string

pkg/apis/addtoscheme_operators_v1.go

@@ -1,10 +1,10 @@
 package apis
 
 import (
-	marketplace "github.com/operator-framework/operator-marketplace/pkg/apis/operators/v1"
+	"github.com/operator-framework/operator-marketplace/pkg/apis/operators/v1"
 )
 
 func init() {
 	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, marketplace.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1.SchemeBuilder.AddToScheme)
 }

pkg/apis/addtoscheme_operators_v2.go

@@ -0,0 +1,10 @@
+package apis
+
+import (
+	"github.com/operator-framework/operator-marketplace/pkg/apis/operators/v2"
+)
+
+func init() {
+	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
+	AddToSchemes = append(AddToSchemes, v2.SchemeBuilder.AddToScheme)
+}

pkg/apis/operators/shared/doc.go

@@ -0,0 +1,4 @@
+// Package shared contains structs used by various API groups
+// +k8s:deepcopy-gen=package,register
+// +groupName=operators.coreos.com
+package shared

pkg/apis/operators/v1/phase.go → pkg/apis/operators/shared/phase.go

@@ -1,4 +1,4 @@
-package v1
+package shared
 
 // NewPhase returns a Phase object with the given name and message
 func NewPhase(name string, message string) *Phase {

pkg/apis/operators/v1/phase_types.go → pkg/apis/operators/shared/phase_types.go

@@ -1,4 +1,4 @@
-package v1
+package shared
 
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 

pkg/apis/operators/v1/shared.go → pkg/apis/operators/shared/shared.go

@@ -1,4 +1,4 @@
-package v1
+package shared
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -7,7 +7,7 @@ import (
 // EnsureFinalizer ensures that the object's finalizer is included
 // in the ObjectMeta Finalizers slice. If it already exists, no state change occurs.
 // If it doesn't, the finalizer is appended to the slice.
-func ensureFinalizer(objectMeta *metav1.ObjectMeta, expectedFinalizer string) {
+func EnsureFinalizer(objectMeta *metav1.ObjectMeta, expectedFinalizer string) {
 	// First check if the finalizer is already included in the object.
 	for _, finalizer := range objectMeta.Finalizers {
 		if finalizer == expectedFinalizer {
@@ -22,7 +22,7 @@ func ensureFinalizer(objectMeta *metav1.ObjectMeta, expectedFinalizer string) {
 }
 
 // RemoveFinalizer removes the finalizer from the object's ObjectMeta.
-func removeFinalizer(objectMeta *metav1.ObjectMeta, deletingFinalizer string) {
+func RemoveFinalizer(objectMeta *metav1.ObjectMeta, deletingFinalizer string) {
 	outFinalizers := make([]string, 0)
 	for _, finalizer := range objectMeta.Finalizers {
 		if finalizer == deletingFinalizer {

pkg/apis/operators/v1/operatorsource_types.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"strings"
 
+	"github.com/operator-framework/operator-marketplace/pkg/apis/operators/shared"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -74,7 +75,7 @@ type OperatorSourceAuthorizationToken struct {
 // OperatorSourceStatus defines the observed state of OperatorSource
 type OperatorSourceStatus struct {
 	// Current phase of the OperatorSource object
-	CurrentPhase ObjectPhase `json:"currentPhase,omitempty"`
+	CurrentPhase shared.ObjectPhase `json:"currentPhase,omitempty"`
 
 	// Packages is a comma separated list of package(s) each of which has been
 	// downloaded and processed by Marketplace operator from the specified
@@ -123,14 +124,14 @@ func (s *OperatorSourceSpec) IsEqual(other *OperatorSourceSpec) bool {
 // RemoveFinalizer removes the operator source finalizer from the
 // OperatorSource ObjectMeta.
 func (s *OperatorSource) RemoveFinalizer() {
-	removeFinalizer(&s.ObjectMeta, OpSrcFinalizer)
+	shared.RemoveFinalizer(&s.ObjectMeta, OpSrcFinalizer)
 }
 
 // EnsureFinalizer ensures that the operator source finalizer is included
 // in the ObjectMeta Finalizers slice. If it already exists, no state change occurs.
 // If it doesn't, the finalizer is appended to the slice.
 func (s *OperatorSource) EnsureFinalizer() {
-	ensureFinalizer(&s.ObjectMeta, OpSrcFinalizer)
+	shared.EnsureFinalizer(&s.ObjectMeta, OpSrcFinalizer)
 }
 
 func init() {

pkg/apis/operators/v1/register.go

@@ -17,6 +17,5 @@ var (
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 
-	OperatorSourceKind      = "OperatorSource"
-	CatalogSourceConfigKind = "CatalogSourceConfig"
+	OperatorSourceKind = "OperatorSource"
 )