remove certs and protobuf (stolostron#202)

zhiweiyin318 · Jul 29, 2020 · f8dfb42 · f8dfb42
1 parent 58f7c26
commit f8dfb42
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 366 deletions.
diff --git a/Makefile b/Makefile
@@ -163,9 +163,6 @@ generate_files: generate_exes $(TYPES_FILES)
   # generate protobuf
 	hack/update-protobuf.sh
 
-create-certs:
-	hack/create-certs.sh
-
 ############################################################
 # build section
 ############################################################

diff --git a/build/run-e2e-tests.sh b/build/run-e2e-tests.sh
@@ -81,8 +81,6 @@ images:
   newName: $IMAGE_NAME_AND_VERSION
 EOF
 
-make create-certs
-
 kubectl apply -k "${HUB_PATH}"
 
 MANAGED_CLUSTER=$(kubectl get managedclusters | grep cluster | awk '{print $1}')
@@ -105,7 +103,7 @@ done
 
 for i in {1..7}; do
   echo "############$i  Checking ManagedClusterInfo"
-  INFO=$(kubectl get managedclusterinfos -n "${MANAGED_CLUSTER}" "${MANAGED_CLUSTER}" -o yaml | grep -c "loggingCA" | tr -d '[:space:]')
+  INFO=$(kubectl get managedclusterinfos -n "${MANAGED_CLUSTER}" "${MANAGED_CLUSTER}" -o yaml | grep -c "ManagedClusterInfo" | tr -d '[:space:]')
   if [ "${INFO}" -eq 1 ]; then
     break
   fi

diff --git a/cmd/acm-controller/app/server.go b/cmd/acm-controller/app/server.go
@@ -54,8 +54,7 @@ func Run(o *options.ControllerRunOptions, stopCh <-chan struct{}) error {
 
 	caData, err := GetAgentCA(o.CAFile)
 	if err != nil {
-		klog.Errorf("unable to get acm agent server CA file: %v", err)
-		return err
+		klog.Warningf("unable to get acm agent server CA file: %v", err)
 	}
 
 	kubeConfig.QPS = o.QPS

diff --git a/deploy/dev/hub/kustomization.yaml b/deploy/dev/hub/kustomization.yaml
@@ -7,8 +7,6 @@ resources:
 - resources/crds/hive.openshift.io_clusterdeployments.yaml
 - resources/crds/hive.openshift.io_syncsetinstances.yaml
 - resources/100-clusterrole.yaml
-- resources/100-agent-cert.yaml
-- resources/100-apiserver-cert.yaml
 - resources/100-proxyserver-apiservice.yaml
 - resources/100-proxyserver-service.yaml
 - resources/200-proxyserver.yaml

diff --git a/deploy/dev/hub/resources/100-agent-cert.yaml b/deploy/dev/hub/resources/100-agent-cert.yaml
diff --git a/deploy/dev/hub/resources/100-apiserver-cert.yaml b/deploy/dev/hub/resources/100-apiserver-cert.yaml
diff --git a/deploy/dev/hub/resources/100-proxyserver-apiservice.yaml b/deploy/dev/hub/resources/100-proxyserver-apiservice.yaml
@@ -8,7 +8,6 @@ spec:
   service:
     namespace: open-cluster-management
     name: acm-proxyserver
-    port: 443
-  caBundle: $ACM_APISERVER_CA
+  insecureSkipTLSVerify: true
   groupPriorityMinimum: 10000
   versionPriority: 20
diff --git a/deploy/dev/hub/resources/200-controller.yaml b/deploy/dev/hub/resources/200-controller.yaml
@@ -27,11 +27,7 @@ spec:
         imagePullPolicy: IfNotPresent
         args:
           - "/acm-controller"
-          - "--agent-cafile=/var/run/agent/ca.crt"
           - "--enable-rbac=true"
-        volumeMounts:
-          - mountPath: /var/run/agent
-            name: agent-certs
         livenessProbe:
           httpGet:
             path: /healthz
@@ -44,8 +40,3 @@ spec:
             port: 8000
           failureThreshold: 3
           periodSeconds: 10
-      volumes:
-      - name: agent-certs
-        secret:
-          defaultMode: 420
-          secretName: acm-agent-cert
diff --git a/deploy/dev/hub/resources/200-proxyserver.yaml b/deploy/dev/hub/resources/200-proxyserver.yaml
@@ -23,11 +23,6 @@ spec:
         args:
           - "/acm-proxyserver"
           - "--secure-port=6443"
-          - "--tls-cert-file=/var/run/apiserver/tls.crt"
-          - "--tls-private-key-file=/var/run/apiserver/tls.key"
-          - "--agent-cafile=/var/run/agent/ca.crt"
-          - "--agent-certfile=/var/run/agent/tls.crt"
-          - "--agent-keyfile=/var/run/agent/tls.key"
         livenessProbe:
           httpGet:
             path: /healthz
@@ -41,17 +36,3 @@ spec:
             scheme: HTTPS
             port: 6443
           initialDelaySeconds: 2
-        volumeMounts:
-        - mountPath: /var/run/agent
-          name: agent-certs
-        - mountPath: /var/run/apiserver
-          name: apiserver-certs
-      volumes:
-      - name: agent-certs
-        secret:
-          defaultMode: 420
-          secretName: acm-agent-cert
-      - name: apiserver-certs
-        secret:
-          defaultMode: 420
-          secretName: acm-apiserver-cert
diff --git a/deploy/dev/hub/webhook/100-mutating-webhook-admission.yaml b/deploy/dev/hub/webhook/100-mutating-webhook-admission.yaml
diff --git a/deploy/dev/hub/webhook/100-validating-webhook-admission.yaml b/deploy/dev/hub/webhook/100-validating-webhook-admission.yaml
diff --git a/deploy/dev/hub/webhook/100-webhook-secret.yaml b/deploy/dev/hub/webhook/100-webhook-secret.yaml
diff --git a/deploy/dev/hub/webhook/200-webhook-deployment.yaml b/deploy/dev/hub/webhook/200-webhook-deployment.yaml
diff --git a/deploy/dev/hub/webhook/200-webhook-service.yaml b/deploy/dev/hub/webhook/200-webhook-service.yaml
diff --git a/deploy/dev/klusterlet/manifestwork/agent.yaml b/deploy/dev/klusterlet/manifestwork/agent.yaml
@@ -87,6 +87,7 @@ spec:
                 - "--port=4443"
                 - "--agent-address=acm-agent.open-cluster-management-agent.svc"
                 - "--agent-port=443"
+                - "--insecure=true"
               volumeMounts:
                 - name: hub-config
                   mountPath: /var/run/hub

diff --git a/deploy/dev/klusterlet/resources/200-agent.yaml b/deploy/dev/klusterlet/resources/200-agent.yaml
@@ -26,6 +26,7 @@ spec:
             - "--port=4443"
             - "--agent-address=acm-agent.open-cluster-management-agent.svc"
             - "--agent-port=443"
+            - "--insecure=true"
           volumeMounts:
             - name: hub-config
               mountPath: /var/run/hub

diff --git a/hack/certs/cert.go b/hack/certs/cert.go