Revert "Fix PodSecurity Warnings (#250)"

This reverts commit ecc541d. Signed-off-by: Zhiwei Yin <zyin@redhat.com>
open-cluster-management-io · Aug 21, 2023 · d4ec48c · d4ec48c
1 parent ecc541d
commit d4ec48c
Show file tree

Hide file tree

Showing 20 changed files with 149 additions and 504 deletions.
diff --git a/Makefile b/Makefile
@@ -13,15 +13,15 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
 )
 
 OPERATOR_SDK?=$(PERMANENT_TMP_GOPATH)/bin/operator-sdk
-OPERATOR_SDK_VERSION?=v1.28.0
+OPERATOR_SDK_VERSION?=v1.1.0
 operatorsdk_gen_dir:=$(dir $(OPERATOR_SDK))
 # CSV_VERSION is used to generate new CSV manifests
 CSV_VERSION?=0.12.0
 
-OPERATOR_SDK_ARCHOS:=linux_amd64
+OPERATOR_SDK_ARCHOS:=x86_64-linux-gnu
 ifeq ($(GOHOSTOS),darwin)
 	ifeq ($(GOHOSTARCH),amd64)
-		OPERATOR_SDK_ARCHOS:=darwin_amd64
+		OPERATOR_SDK_ARCHOS:=x86_64-apple-darwin
 	endif
 endif
 
@@ -57,12 +57,12 @@ patch-crd: ensure-yaml-patch
 update: patch-crd copy-crd update-csv
 
 update-csv: ensure-operator-sdk
-	cd deploy/cluster-manager && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package cluster-manager --input-dir config --output-dir olm-catalog/cluster-manager
-	cd deploy/klusterlet && ../../$(OPERATOR_SDK) generate bundle --version $(CSV_VERSION) --package klusterlet --input-dir config --output-dir olm-catalog/klusterlet
+	cd deploy/cluster-manager && ../../$(OPERATOR_SDK) generate bundle --manifests --deploy-dir config/ --crds-dir config/crds/ --output-dir olm-catalog/cluster-manager/ --version $(CSV_VERSION)
+	cd deploy/klusterlet && ../../$(OPERATOR_SDK) generate bundle --manifests --deploy-dir config/ --crds-dir config/crds/ --output-dir olm-catalog/klusterlet/ --version=$(CSV_VERSION)
 
-	# delete bundle.Dockerfile since we do not use it to build image.
-	rm ./deploy/cluster-manager/bundle.Dockerfile
-	rm ./deploy/klusterlet/bundle.Dockerfile
+	# delete useless serviceaccounts in manifests although they are copied from config by operator-sdk.
+	rm ./deploy/cluster-manager/olm-catalog/cluster-manager/manifests/cluster-manager_v1_serviceaccount.yaml
+	rm ./deploy/klusterlet/olm-catalog/klusterlet/manifests/klusterlet_v1_serviceaccount.yaml
 
 verify-crds: patch-crd
 	bash -x hack/verify-crds.sh
@@ -93,7 +93,7 @@ ensure-operator-sdk:
 ifeq "" "$(wildcard $(OPERATOR_SDK))"
 	$(info Installing operator-sdk into '$(OPERATOR_SDK)')
 	mkdir -p '$(operatorsdk_gen_dir)'
-	curl -s -f -L https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$(OPERATOR_SDK_ARCHOS) -o '$(OPERATOR_SDK)'
+	curl -s -f -L https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk-$(OPERATOR_SDK_VERSION)-$(OPERATOR_SDK_ARCHOS) -o '$(OPERATOR_SDK)'
 	chmod +x '$(OPERATOR_SDK)';
 else
 	$(info Using existing operator-sdk from "$(OPERATOR_SDK)")

diff --git a/deploy/cluster-manager/PROJECT b/deploy/cluster-manager/PROJECT
@@ -1,4 +1,2 @@
-version: "3"
-layout:
-- go.kubebuilder.io/v3
 projectName: cluster-manager
+version: 2
diff --git a/deploy/cluster-manager/config/operator/operator.yaml b/deploy/cluster-manager/config/operator/operator.yaml
@@ -37,10 +37,6 @@ spec:
                   values:
                   - cluster-manager
       serviceAccountName: cluster-manager
-      securityContext:
-        runAsNonRoot: true
-        seccompProfile:
-          type: RuntimeDefault
       containers:
       - name: registration-operator
         image: quay.io/open-cluster-management/registration-operator:latest
@@ -53,6 +49,7 @@ spec:
             drop:
               - ALL
           privileged: false
+          runAsNonRoot: true
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml b/...-manager/olm-catalog/cluster-manager/manifests/cluster-manager.clusterserviceversion.yaml
@@ -59,10 +59,10 @@ metadata:
     categories: Integration & Delivery,OpenShift Optional
     certified: "false"
     containerImage: quay.io/open-cluster-management/registration-operator:latest
-    createdAt: "2023-08-15T09:59:52Z"
+    createdAt: "2023-05-24T20:00:31Z"
     description: Manages the installation and upgrade of the ClusterManager.
-    operators.operatorframework.io/builder: operator-sdk-v1.28.0
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
+    operators.operatorframework.io/builder: operator-sdk-v1.1.0
+    operators.operatorframework.io/project_layout: go
     repository: https://github.com/open-cluster-management-io/registration-operator
     support: Red Hat, Inc.
   name: cluster-manager.v0.12.0
@@ -71,8 +71,7 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: ClusterManager defines the configurations of controllers running
-        hub that govern registration and work distribution for attached Klusterlets
+    - description: ClusterManager defines the configurations of controllers running hub that govern registration and work distribution for attached Klusterlets
       displayName: ClusterManager
       kind: ClusterManager
       name: clustermanagers.operator.open-cluster-management.io
@@ -500,9 +499,7 @@ spec:
           - get
         serviceAccountName: cluster-manager
       deployments:
-      - label:
-          app: cluster-manager
-        name: cluster-manager
+      - name: cluster-manager
         spec:
           replicas: 3
           selector:
@@ -564,10 +561,7 @@ spec:
                     drop:
                     - ALL
                   privileged: false
-              securityContext:
-                runAsNonRoot: true
-                seccompProfile:
-                  type: RuntimeDefault
+                  runAsNonRoot: true
               serviceAccountName: cluster-manager
     strategy: deployment
   installModes: