Merge remote-tracking branch 'origin/master' into federation-service-…

…cluster
kubermatic · Jan 10, 2020 · b0cc814 · b0cc814
2 parents 42e8a6c + 7d60914
commit b0cc814
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/config/internal/ferry/rbac/role.yaml b/config/internal/ferry/rbac/role.yaml
@@ -1,7 +1,7 @@
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: manager-role

diff --git a/config/internal/manager/crd/bases/catalog.kubecarrier.io_catalogentries.yaml b/config/internal/manager/crd/bases/catalog.kubecarrier.io_catalogentries.yaml
@@ -198,8 +198,6 @@ spec:
                     strings when printing the property. This is only for display purpose,
                     for everything else use conditions.
                   type: string
-              required:
-                - crds
               type: object
           type: object
       served: true

diff --git a/hack/codegen.sh b/hack/codegen.sh
@@ -80,13 +80,21 @@ statik-gen manager config/internal/manager
 # -------
 # RBAC
 $CONTROLLER_GEN rbac:roleName=manager-role paths="./pkg/ferry/..." output:rbac:artifacts:config=config/internal/ferry/rbac
-sed -i 's/ClusterRole/Role/g' config/internal/ferry/rbac/role.yaml
+# The `|| true` is because the `,s/ClusterRole/Role/g` will error out if there is no match of `ClusterRole` (eg., the file is empty) in the file.
+ed config/internal/ferry/rbac/role.yaml <<EOF || true
+,s/ClusterRole/Role/g
+w
+EOF
 # Statik (run only when file CONTENT has changed)
 statik-gen ferry config/internal/ferry
 
 # Catapult
 # -------
 # RBAC
 $CONTROLLER_GEN rbac:roleName=manager-role paths="./pkg/catapult/..." output:rbac:artifacts:config=config/internal/catapult/rbac
-sed -i 's/ClusterRole/Role/g' config/internal/catapult/rbac/role.yaml
+# The `|| true` is because the `,s/ClusterRole/Role/g` will error out if there is no match of `ClusterRole` (eg., the file is empty) in the file.
+ed config/internal/catapult/rbac/role.yaml <<EOF || true
+,s/ClusterRole/Role/g
+w
+EOF
 statik-gen catapult config/internal/catapult
diff --git a/pkg/apis/catalog/v1alpha1/catalogentry_types.go b/pkg/apis/catalog/v1alpha1/catalogentry_types.go
@@ -39,7 +39,7 @@ type CatalogEntryMetadata struct {
 // CatalogEntryStatus defines the observed state of CatalogEntry.
 type CatalogEntryStatus struct {
 	// CRDs holds the information about the underlying CRDs that are offered by this CatalogEntry.
-	CRDs []CRDInformation `json:"crds"`
+	CRDs []CRDInformation `json:"crds,omitempty"`
 
 	// ObservedGeneration is the most recent generation observed for this CatalogEntry by the controller.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`

diff --git a/pkg/internal/resources/ferry/ferry.golden.yaml b/pkg/internal/resources/ferry/ferry.golden.yaml
@@ -1,9 +1,8 @@
 - apiVersion: rbac.authorization.k8s.io/v1
-  kind: Role
+  kind: ClusterRole
   metadata:
     creationTimestamp: null
     name: hans-ferry-manager-role
-    namespace: provider-1000
   rules:
   - apiGroups:
     - kubecarrier.io

diff --git a/pkg/internal/resources/ferry/statik.go b/pkg/internal/resources/ferry/statik.go
diff --git a/pkg/internal/resources/manager/manager.golden.yaml b/pkg/internal/resources/manager/manager.golden.yaml
@@ -502,8 +502,6 @@
                     strings when printing the property. This is only for display purpose,
                     for everything else use conditions.
                   type: string
-              required:
-              - crds
               type: object
           type: object
       served: true

diff --git a/pkg/internal/resources/manager/statik.go b/pkg/internal/resources/manager/statik.go
diff --git a/pkg/manager/internal/controllers/catalogentry_controller_test.go b/pkg/manager/internal/controllers/catalogentry_controller_test.go
@@ -105,7 +105,7 @@ func TestCatalogEntryReconciler(t *testing.T) {
 			Name: "test-crd-3.test-crd-group-3.test",
 			Annotations: map[string]string{
 				"kubecarrier.io/serviceCluster": "test-serviceCluster-3",
-				catalogEntryReferenceAnnotation:  "test-catalogentry",
+				catalogEntryReferenceAnnotation: "test-catalogentry",
 			},
 			Labels: map[string]string{
 				"kubecarrier.io/provider": "example.provider",