Support v1 OperatorGroup and v1alpha2 OperatorGroup

Author: ecordell

deploy/chart/templates/0000_50_olm_10-operatorgroup.crd.yaml

@@ -6,9 +6,12 @@ spec:
   group: operators.coreos.com
   version: v1
   versions:
-  - name: v1
-    served: true
-    storage: true
+    - name: v1
+      served: true
+      storage: true
+    - name: v1alpha2
+      served: true
+      storage: false
   names:
     plural: operatorgroups
     singular: operatorgroup

deploy/chart/templates/0000_50_olm_16-packageserver.clusterserviceversion.yaml

@@ -33,6 +33,13 @@ spec:
       clusterPermissions:
       - serviceAccountName: packageserver
         rules:
+        - apiGroups:
+          - authorization.k8s.io
+          resources:
+          - subjectaccessreviews
+          verbs:
+          - create
+          - get
         - apiGroups:
           - ""
           resources:
@@ -50,20 +57,20 @@ spec:
           - list
           - watch
         - apiGroups:
-          - packages.apps.redhat.com
+            - "packages.operators.coreos.com"
           resources:
-          - packagemanifests
+            - packagemanifests
           verbs:
-          - get
-          - list
+            - get
+            - list
       deployments:
       - name: packageserver
 {{- include "packageserver.deployment-spec" . | indent 8 }}
   maturity: alpha
   version: {{ .Chart.Version }}
   apiservicedefinitions:
     owned:
-    - group: operators.coreos.com
+    - group: packages.operators.coreos.com
       version: v1
       kind: PackageManifest
       name: packagemanifest

deploy/chart/templates/_packageserver.clusterserviceversion.yaml

@@ -32,6 +32,13 @@
         clusterPermissions:
         - serviceAccountName: packageserver
           rules:
+          - apiGroups:
+              - authorization.k8s.io
+            resources:
+              - subjectaccessreviews
+            verbs:
+              - create
+              - get
           - apiGroups:
             - ""
             resources:
@@ -49,7 +56,7 @@
             - list
             - watch
           - apiGroups:
-            - "packages.apps.redhat.com"
+            - "packages.operators.coreos.com"
             resources:
             - packagemanifests
             verbs:
@@ -115,8 +122,8 @@
     version: {{ .Chart.Version }}
     apiservicedefinitions:
       owned:
-      - group: packages.apps.redhat.com
-        version: v1alpha1
+      - group: packages.operators.coreos.com
+        version: v1
         kind: PackageManifest
         name: packagemanifests
         displayName: PackageManifest

deploy/chart/values.yaml

@@ -7,6 +7,7 @@ minKubeVersion: 1.11.0
 writeStatusName: '""'
 imagestream: false
 debug: false
+installType: upstream
 olm:
   replicaCount: 1
   image:

manifests/0000_50_olm_09-operatorgroup.crd.yaml

@@ -4,7 +4,6 @@ metadata:
   name: operatorgroups.operators.coreos.com
 spec:
   group: operators.coreos.com
-  version: v1alpha2
   versions:
   - name: v1alpha2
     served: true
@@ -91,4 +90,4 @@ spec:
           - lastUpdated
           type: object
       required:
-      - metadata
+      - metadata

pkg/package-server/apis/packagemanifest/v1/register.go

@@ -13,7 +13,7 @@ var (
 )
 
 const (
-	Group                   = operators.GroupName
+	Group                   = "packages." + operators.GroupName
 	Version                 = "v1"
 	PackageManifestKind     = "PackageManifest"
 	PackageManifestListKind = "PackageManifestList"

test/e2e/csv_e2e_test.go

@@ -644,8 +644,8 @@ func TestCreateCSVWithUnmetPermissionsAPIService(t *testing.T) {
 			APIServiceDefinitions: v1alpha1.APIServiceDefinitions{
 				Required: []v1alpha1.APIServiceDescription{
 					{
-						Group:       "packages.apps.redhat.com",
-						Version:     "v1alpha1",
+						Group:       "packages.operators.coreos.com",
+						Version:     "v1",
 						Kind:        "PackageManifest",
 						DisplayName: "Package Manifest",
 						Description: "An apiservice that exists",
@@ -1054,8 +1054,8 @@ func TestCreateCSVRequirementsMetAPIService(t *testing.T) {
 			APIServiceDefinitions: v1alpha1.APIServiceDefinitions{
 				Required: []v1alpha1.APIServiceDescription{
 					{
-						Group:       "packages.apps.redhat.com",
-						Version:     "v1alpha1",
+						Group:       "packages.operators.coreos.com",
+						Version:     "v1",
 						Kind:        "PackageManifest",
 						DisplayName: "Package Manifest",
 						Description: "An apiservice that exists",

vendor/modules.txt

@@ -302,6 +302,8 @@ k8s.io/apiextensions-apiserver/pkg/apiserver/validation
 k8s.io/apiextensions-apiserver/pkg/features
 # k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841
 k8s.io/apimachinery/pkg/apis/meta/v1
+k8s.io/apimachinery/pkg/runtime/schema
+k8s.io/apimachinery/pkg/util/wait
 k8s.io/apimachinery/pkg/runtime
 k8s.io/apimachinery/pkg/runtime/schema
 k8s.io/apimachinery/pkg/types
@@ -316,7 +318,6 @@ k8s.io/apimachinery/pkg/runtime/serializer/json
 k8s.io/apimachinery/pkg/api/meta
 k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
 k8s.io/apimachinery/pkg/util/strategicpatch
-k8s.io/apimachinery/pkg/util/wait
 k8s.io/apimachinery/pkg/apis/meta/internalversion
 k8s.io/apimachinery/pkg/fields
 k8s.io/apimachinery/pkg/version
@@ -326,6 +327,12 @@ k8s.io/apimachinery/pkg/util/sets
 k8s.io/apimachinery/pkg/util/waitgroup
 k8s.io/apimachinery/pkg/conversion
 k8s.io/apimachinery/pkg/selection
+k8s.io/apimachinery/pkg/util/validation/field
+k8s.io/apimachinery/pkg/conversion
+k8s.io/apimachinery/pkg/selection
+k8s.io/apimachinery/pkg/util/sets
+k8s.io/apimachinery/pkg/util/validation
+k8s.io/apimachinery/pkg/util/waitgroup
 k8s.io/apimachinery/pkg/conversion/queryparams
 k8s.io/apimachinery/pkg/util/json
 k8s.io/apimachinery/pkg/util/clock
@@ -336,7 +343,6 @@ k8s.io/apimachinery/pkg/runtime/serializer/recognizer
 k8s.io/apimachinery/pkg/runtime/serializer/versioning
 k8s.io/apimachinery/pkg/util/cache
 k8s.io/apimachinery/pkg/util/diff
-k8s.io/apimachinery/pkg/util/validation/field
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/validation
 k8s.io/apimachinery/pkg/util/yaml
@@ -441,8 +447,8 @@ k8s.io/apiserver/pkg/storage/etcd3
 k8s.io/apiserver/pkg/storage/etcd/util
 # k8s.io/client-go v8.0.0+incompatible
 k8s.io/client-go/tools/clientcmd
-k8s.io/client-go/tools/record
 k8s.io/client-go/kubernetes/scheme
+k8s.io/client-go/tools/record
 k8s.io/client-go/plugin/pkg/client/auth/oidc
 k8s.io/client-go/rest
 k8s.io/client-go/discovery