fix(config):update config manifests

Signed-off-by: Steven Zou <szou@vmware.com>
goharbor · Nov 27, 2020 · 41b8eda · 41b8eda
1 parent 8b06af2
commit 41b8eda
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 25 deletions.
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: harbor-operator
 spec:
   template:
     spec:

diff --git a/config/default/manager_prometheus_metrics_patch.yaml b/config/default/manager_prometheus_metrics_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: harbor-operator
 spec:
   template:
     spec:

diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: harbor-operator
 spec:
   template:
     spec:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: harbor-operator
   labels:
-    control-plane: controller-manager
+    control-plane: harbor-operator
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: harbor-operator
   template:
     metadata:
       labels:
-        control-plane: controller-manager
+        control-plane: harbor-operator
     spec:
       containers:
       - command:

diff --git a/config/manager/patches-configuration.yaml b/config/manager/patches-configuration.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: harbor-operator
 spec:
   template:
     spec:

diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml
@@ -8,4 +8,4 @@ spec:
     - port: 443
       targetPort: 9443
   selector:
-    control-plane: controller-manager
+    control-plane: harbor-operator
diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -2042,6 +2042,7 @@ spec:
                     type: array
                 type: object
               database:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   hosts:
                     items:
@@ -2170,6 +2171,7 @@ spec:
                 pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
                 type: string
               imageChartStorage:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   filesystem:
                     description: 'FileSystem is an implementation of the storagedriver.StorageDriver interface which uses the local filesystem. The local filesystem can be a remote volume. See: https://docs.docker.com/registry/storage-drivers/filesystem/'
@@ -2944,6 +2946,7 @@ spec:
                 - url
                 type: object
               redis:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   certificateRef:
                     description: Secret containing the client certificate to authenticate with.
@@ -3163,13 +3166,10 @@ spec:
                 default: RollingUpdate
                 type: string
             required:
-            - database
             - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef
-            - imageChartStorage
-            - redis
             type: object
           status:
             description: HarborClusterStatus defines the observed state of HarborCluster
@@ -3435,6 +3435,7 @@ spec:
                     type: array
                 type: object
               database:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   hosts:
                     items:
@@ -3563,6 +3564,7 @@ spec:
                 pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
                 type: string
               imageChartStorage:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   filesystem:
                     description: 'FileSystem is an implementation of the storagedriver.StorageDriver interface which uses the local filesystem. The local filesystem can be a remote volume. See: https://docs.docker.com/registry/storage-drivers/filesystem/'
@@ -4050,6 +4052,7 @@ spec:
                 - url
                 type: object
               redis:
+                description: Skip OpenAPI schema validation Use validating webhook to do verification (field required)
                 properties:
                   certificateRef:
                     description: Secret containing the client certificate to authenticate with.
@@ -4269,13 +4272,10 @@ spec:
                 default: RollingUpdate
                 type: string
             required:
-            - database
             - encryptionKeyRef
             - expose
             - externalURL
             - harborAdminPasswordRef
-            - imageChartStorage
-            - redis
             type: object
           status:
             description: ComponentStatus represents the current status of the resource. https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
@@ -15441,7 +15441,7 @@ spec:
   - port: 443
     targetPort: 9443
   selector:
-    control-plane: controller-manager
+    control-plane: harbor-operator
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -15451,21 +15451,21 @@ metadata:
     goharbor.io/deploy-mode: cluster
     goharbor.io/operator-version: v1.0.0
   labels:
-    control-plane: controller-manager
-  name: controller-manager
+    control-plane: harbor-operator
+  name: harbor-operator
   namespace: harbor-operator-ns
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: harbor-operator
   template:
     metadata:
       annotations:
         goharbor.io/deploy-engine: Kustomization
         goharbor.io/deploy-mode: cluster
         goharbor.io/operator-version: v1.0.0
       labels:
-        control-plane: controller-manager
+        control-plane: harbor-operator
     spec:
       containers:
       - args:
@@ -15708,6 +15708,24 @@ webhooks:
     - UPDATE
     resources:
     - harbors
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: webhook-service
+      namespace: harbor-operator-ns
+      path: /validate-goharbor-io-v1alpha2-harborcluster
+  failurePolicy: Fail
+  name: vharborcluster.kb.io
+  rules:
+  - apiGroups:
+    - goharbor.io
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - harborclusters
 - clientConfig:
     caBundle: Cg==
     service:

diff --git a/pkg/setup/webhooks.go b/pkg/setup/webhooks.go
@@ -15,11 +15,12 @@ const (
 )
 
 var webhooksBuilder = map[controllers.Controller]WebHook{
-	controllers.Harbor:       &goharborv1alpha2.Harbor{},
-	controllers.JobService:   &goharborv1alpha2.JobService{},
-	controllers.Registry:     &goharborv1alpha2.Registry{},
-	controllers.NotaryServer: &goharborv1alpha2.NotaryServer{},
-	controllers.NotarySigner: &goharborv1alpha2.NotarySigner{},
+	controllers.Harbor:        &goharborv1alpha2.Harbor{},
+	controllers.JobService:    &goharborv1alpha2.JobService{},
+	controllers.Registry:      &goharborv1alpha2.Registry{},
+	controllers.NotaryServer:  &goharborv1alpha2.NotaryServer{},
+	controllers.NotarySigner:  &goharborv1alpha2.NotarySigner{},
+	controllers.HarborCluster: &goharborv1alpha2.HarborCluster{},
 }
 
 type WebHook interface {