Update CRD printer, remove unused files

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
alexellis · Aug 18, 2020 · bbba28b · bbba28b
1 parent b119605
commit bbba28b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 50 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ deploy: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=registry-creds-role paths="./..." output:crd:artifacts:config=config/crd/bases
 
 # Run go fmt against code
 fmt:

diff --git a/api/v1/clusterpullsecret_types.go b/api/v1/clusterpullsecret_types.go
@@ -34,6 +34,8 @@ type ClusterPullSecretStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
+// +kubebuilder:printcolumn:name="SecretName",type=string,JSONPath=`.spec.secretRef.name`
+// +kubebuilder:printcolumn:name="SecretNamespace",type=string,JSONPath=`.spec.secretRef.namespace`
 
 // ClusterPullSecret is the Schema for the clusterpullsecrets API
 type ClusterPullSecret struct {

diff --git a/config/crd/bases/ops.alexellis.io_clusterpullsecrets.yaml b/config/crd/bases/ops.alexellis.io_clusterpullsecrets.yaml
@@ -8,13 +8,21 @@ metadata:
   creationTimestamp: null
   name: clusterpullsecrets.ops.alexellis.io
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.secretRef.name
+    name: SecretName
+    type: string
+  - JSONPath: .spec.secretRef.namespace
+    name: SecretNamespace
+    type: string
   group: ops.alexellis.io
   names:
     kind: ClusterPullSecret
     listKind: ClusterPullSecretList
     plural: clusterpullsecrets
     singular: clusterpullsecret
   scope: Cluster
+  subresources: {}
   validation:
     openAPIV3Schema:
       description: ClusterPullSecret is the Schema for the clusterpullsecrets API

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -17,11 +17,10 @@ bases:
 - ../rbac
 - ../manager
 
-
 patchesStrategicMerge:
   # Protect the /metrics endpoint by putting it behind auth.
   # If you want your controller-manager to expose the /metrics
   # endpoint w/o any authn/z, please comment the following line.
-- manager_auth_proxy_patch.yaml
+# - manager_auth_proxy_patch.yaml
 
 vars:
diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/auth_proxy_client_clusterrole.yaml
diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: registry-creds-role
 rules:
 - apiGroups:
   - ""