Merge branch 'secret_role' of github.com:mshaposhnik/che-operator int…

…o secret_role
eclipse-che · Aug 2, 2021 · a19a54b · a19a54b
2 parents 7d050d8 + 0af4915
commit a19a54b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 11 deletions.
diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh
@@ -52,7 +52,7 @@ function Catch_Finish() {
     bumpPodsInfo "admin-che"
     oc get devworkspaces -n "admin-che" -o=yaml > $ARTIFACTS_DIR/devworkspaces.yaml
 
-    collectCheLogWithChectl
+    collectLogs
 }
 
 overrideDefaults() {

diff --git a/.github/bin/common.sh b/.github/bin/common.sh
@@ -14,7 +14,7 @@ set -x
 catchFinish() {
   result=$?
 
-  collectCheLogWithChectl
+  collectLogs
   if [ "$result" != "0" ]; then
     echo "[ERROR] Job failed."
   else
@@ -166,9 +166,14 @@ installYq() {
 }
 
 # Graps Eclipse Che logs
-collectCheLogWithChectl() {
+collectLogs() {
   mkdir -p ${ARTIFACTS_DIR}
   chectl server:logs --chenamespace=${NAMESPACE} --directory=${ARTIFACTS_DIR}
+
+  set +x
+  oc get events -n ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE} > ${ARTIFACTS_DIR}/events-${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}.txt
+  oc get events -n ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE} > ${ARTIFACTS_DIR}/events-${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}.txt
+  set -x
 }
 
 # Build latest operator image

diff --git a/.github/bin/minikube/test-olm.sh b/.github/bin/minikube/test-olm.sh
@@ -42,10 +42,13 @@ runTest() {
   sleep 10s
   createWorkspaceDevWorkspaceController
   waitAllPodsRunning ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+
+  sleep 60s
 
-  sleep 10s
   createWorkspaceDevWorkspaceCheOperator
   waitAllPodsRunning ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
 }
 
 initDefaults

diff --git a/.github/bin/minikube/test-operator-singlehost-gateway.sh b/.github/bin/minikube/test-operator-singlehost-gateway.sh
@@ -51,10 +51,13 @@ runTest() {
   sleep 10s
   createWorkspaceDevWorkspaceController
   waitAllPodsRunning ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+
+  sleep 60s
 
-  sleep 10s
   createWorkspaceDevWorkspaceCheOperator
   waitAllPodsRunning ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
 }
 
 initDefaults

diff --git a/.github/bin/minikube/test-operator-singlehost-native.sh b/.github/bin/minikube/test-operator-singlehost-native.sh
@@ -50,10 +50,13 @@ runTest() {
   sleep 10s
   createWorkspaceDevWorkspaceController
   waitAllPodsRunning ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CONTROLLER_TEST_NAMESPACE}
+
+  sleep 60s
 
-  sleep 10s
   createWorkspaceDevWorkspaceCheOperator
   waitAllPodsRunning ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
+  kubectl delete namespace ${DEVWORKSPACE_CHE_OPERATOR_TEST_NAMESPACE}
 }
 
 initDefaults

diff --git a/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
@@ -83,7 +83,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-kubernetes.v7.34.0-269.nightly
+  name: eclipse-che-preview-kubernetes.v7.34.0-270.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -386,6 +386,7 @@ spec:
                 - list
                 - get
                 - create
+                - update
                 - delete
             - apiGroups:
                 - ""
@@ -1300,4 +1301,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.34.0-269.nightly
+  version: 7.34.0-270.nightly
diff --git a/...e/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/...e/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-openshift.v7.34.0-269.nightly
+  name: eclipse-che-preview-openshift.v7.34.0-270.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -451,6 +451,7 @@ spec:
                 - list
                 - get
                 - create
+                - update
                 - delete
             - apiGroups:
                 - ""
@@ -1364,4 +1365,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.34.0-269.nightly
+  version: 7.34.0-270.nightly
diff --git a/controllers/che/workspace_namespace_permission.go b/controllers/che/workspace_namespace_permission.go
@@ -261,7 +261,7 @@ func getWorkspacesPolicies() []rbac.PolicyRule {
 		{
 			APIGroups: []string{""},
 			Resources: []string{"secrets"},
-			Verbs:     []string{"get", "list", "update", "create", "delete"},
+			Verbs:     []string{"get", "patch", "list", "update", "create", "delete"},
 		},
 		{
 			APIGroups: []string{""},