Merge pull request #159 from joelddiaz/no-runlevel

Bug 1806892: no need to run CCO as privileged pod
openshift · Mar 3, 2020 · cc686af · cc686af
2 parents 9869473 + 8120317
commit cc686af
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,6 +20,8 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 WORKDIR /root/
 COPY --from=builder /go/src/github.com/openshift/cloud-credential-operator/manager .
 ADD manifests/ /manifests
+# Update perms so we can copy updated CA if needed
+RUN chmod -R g+w /etc/pki/ca-trust/extracted/pem/
 
 LABEL io.openshift.release.operator=true
 ENTRYPOINT ["./manager"]
diff --git a/config/manager/namespace.yaml b/config/manager/namespace.yaml
@@ -5,6 +5,5 @@ metadata:
     openshift.io/node-selector: ""
   labels:
     controller-tools.k8s.io: "1.0"
-    openshift.io/run-level: "1"
     openshift.io/cluster-monitoring: "true"
   name: openshift-cloud-credential-operator
diff --git a/manifests/00_namespace.yaml b/manifests/00_namespace.yaml
@@ -5,6 +5,5 @@ metadata:
     openshift.io/node-selector: ""
   labels:
     controller-tools.k8s.io: "1.0"
-    openshift.io/run-level: "1"
     openshift.io/cluster-monitoring: "true"
   name: openshift-cloud-credential-operator
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
@@ -239,7 +239,6 @@ metadata:
     openshift.io/node-selector: ""
   labels:
     controller-tools.k8s.io: "1.0"
-    openshift.io/run-level: "1"
     openshift.io/cluster-monitoring: "true"
   name: openshift-cloud-credential-operator
 `)