chore: removes proxy_cluster_role.yaml (#922)

* chore: remove proxy_cluster_role.yaml Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Jul 14, 2021 · 9bb621b · 9bb621b
1 parent 5648767
commit 9bb621b
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 94 deletions.
diff --git a/.github/bin/check-resources.sh b/.github/bin/check-resources.sh
@@ -140,12 +140,11 @@ checkRoles() {
   # files to check
   local RoleYaml="deploy/role.yaml"
   local ClusterRoleYaml="deploy/cluster_role.yaml"
-  local ProxyClusterRoleYaml="deploy/proxy_cluster_role.yaml"
 
   changedFiles=(
     $(git diff --name-only)
   )
-  if [[ " ${changedFiles[*]} " =~ $RoleYaml ]] || [[ " ${changedFiles[*]} " =~ $ClusterRoleYaml ]] || [[ " ${changedFiles[*]} " =~ $ProxyClusterRoleYaml ]]; then
+  if [[ " ${changedFiles[*]} " =~ $RoleYaml ]] || [[ " ${changedFiles[*]} " =~ $ClusterRoleYaml ]]; then
     echo "[ERROR] Roles are not up to date: ${BASH_REMATCH}"
     echo "[ERROR] Run 'olm/update-resources.sh' to update them."
     exit 1

diff --git a/deploy.sh b/deploy.sh
@@ -30,8 +30,6 @@ oc apply -f ${BASE_DIR}/deploy/role.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/role_binding.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/cluster_role.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/cluster_role_binding.yaml -n $NAMESPACE
-oc apply -f ${BASE_DIR}/deploy/proxy_cluster_role.yaml -n $NAMESPACE
-oc apply -f ${BASE_DIR}/deploy/proxy_cluster_role_binding.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/crds/org_v1_che_crd.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/crds/org.eclipse.che_chebackupserverconfigurations_crd.yaml -n $NAMESPACE
 oc apply -f ${BASE_DIR}/deploy/crds/org.eclipse.che_checlusterbackups_crd.yaml -n $NAMESPACE

diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/build-roles.sh b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/build-roles.sh
@@ -16,7 +16,6 @@ mkdir -p "${BASE_DIR}/generated/roles"
 
 cp "${BASE_DIR}/../../../role.yaml" "${BASE_DIR}/generated/roles/role.yaml"
 cp "${BASE_DIR}/../../../cluster_role.yaml" "${BASE_DIR}/generated/roles/cluster_role.yaml"
-cp "${BASE_DIR}/../../../proxy_cluster_role.yaml" "${BASE_DIR}/generated/roles/proxy_cluster_role.yaml"
 
 for role in ${BASE_DIR}/generated/roles/*.yaml; do
   index=0

diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/csv-config.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/csv-config.yaml
@@ -1,3 +1,3 @@
-role-paths: [ "deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated/roles/role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated/roles/cluster_role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated/roles/proxy_cluster_role.yaml"]
+role-paths: [ "deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated/roles/role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/generated/roles/cluster_role.yaml"]
 operator-path: deploy/operator.yaml
 crd-cr-paths: ["deploy/crds/org_v1_che_crd.yaml", "deploy/crds/org.eclipse.che_chebackupserverconfigurations_crd.yaml", deploy/crds/org.eclipse.che_checlusterbackups_crd.yaml", "deploy/crds/org.eclipse.che_checlusterrestores_crd.yaml"]
diff --git a/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
@@ -86,13 +86,13 @@ metadata:
     categories: Developer Tools
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:next
-    createdAt: "2021-07-14T06:55:06Z"
+    createdAt: "2021-07-14T07:19:58Z"
     description: A Kube-native development solution that delivers portable and collaborative
       developer workspaces.
     operatorframework.io/suggested-namespace: eclipse-che
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-kubernetes.v7.33.0-254.nightly
+  name: eclipse-che-preview-kubernetes.v7.33.0-256.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -887,20 +887,6 @@ spec:
               verbs:
                 - get
           serviceAccountName: che-operator
-        - rules:
-            - apiGroups:
-                - authentication.k8s.io
-              resources:
-                - tokenreviews
-              verbs:
-                - create
-            - apiGroups:
-                - authorization.k8s.io
-              resources:
-                - subjectaccessreviews
-              verbs:
-                - create
-          serviceAccountName: default
       deployments:
         - name: che-operator
           spec:
@@ -1241,4 +1227,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.33.0-254.nightly
+  version: 7.33.0-256.nightly
diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/build-roles.sh b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/build-roles.sh
@@ -15,4 +15,3 @@ rm -Rf "${BASE_DIR}/generated/roles"
 mkdir -p "${BASE_DIR}/generated/roles"
 cp "${BASE_DIR}/../../../role.yaml" "${BASE_DIR}/generated/roles/role.yaml"
 cp "${BASE_DIR}/../../../cluster_role.yaml" "${BASE_DIR}/generated/roles/cluster_role.yaml"
-cp "${BASE_DIR}/../../../proxy_cluster_role.yaml" "${BASE_DIR}/generated/roles/proxy_cluster_role.yaml"
diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/csv-config.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/csv-config.yaml
@@ -1,3 +1,3 @@
 operator-path: deploy/operator.yaml
-role-paths: [ "deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated/roles/role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated/roles/cluster_role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated/roles/proxy_cluster_role.yaml"]
+role-paths: [ "deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated/roles/role.yaml", "deploy/olm-catalog/nightly/eclipse-che-preview-openshift/generated/roles/cluster_role.yaml"]
 crd-cr-paths: ["deploy/crds/org_v1_che_crd.yaml", "deploy/crds/org.eclipse.che_chebackupserverconfigurations_crd.yaml", "deploy/crds/org.eclipse.che_checlusterbackups_crd.yaml", "deploy/crds/org.eclipse.che_checlusterrestores_crd.yaml"]
diff --git a/...g/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/...g/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@@ -77,13 +77,13 @@ metadata:
     categories: Developer Tools, OpenShift Optional
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:next
-    createdAt: "2021-07-14T06:55:12Z"
+    createdAt: "2021-07-14T07:20:04Z"
     description: A Kube-native development solution that delivers portable and collaborative
       developer workspaces in OpenShift.
     operatorframework.io/suggested-namespace: eclipse-che
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-openshift.v7.33.0-254.nightly
+  name: eclipse-che-preview-openshift.v7.33.0-256.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -956,20 +956,6 @@ spec:
               verbs:
                 - get
           serviceAccountName: che-operator
-        - rules:
-            - apiGroups:
-                - authentication.k8s.io
-              resources:
-                - tokenreviews
-              verbs:
-                - create
-            - apiGroups:
-                - authorization.k8s.io
-              resources:
-                - subjectaccessreviews
-              verbs:
-                - create
-          serviceAccountName: default
       deployments:
         - name: che-operator
           spec:
@@ -1318,4 +1304,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.33.0-254.nightly
+  version: 7.33.0-256.nightly
diff --git a/deploy/proxy_cluster_role.yaml b/deploy/proxy_cluster_role.yaml
diff --git a/deploy/proxy_cluster_role_binding.yaml b/deploy/proxy_cluster_role_binding.yaml
diff --git a/olm/update-resources.sh b/olm/update-resources.sh
@@ -162,18 +162,6 @@ updateRoles() {
       echo "$line" >> $ROOT_PROJECT_DIR/deploy/role.yaml
     done <<< "$CONTENT"
   done
-
-  # Updates proxy_cluster_role.yaml based on DWCO
-  ## Remove old roles
-  cat $ROOT_PROJECT_DIR/deploy/proxy_cluster_role.yaml | sed '/rules:/q0' > $ROOT_PROJECT_DIR/deploy/proxy_cluster_role.yaml.tmp
-  mv $ROOT_PROJECT_DIR/deploy/proxy_cluster_role.yaml.tmp $ROOT_PROJECT_DIR/deploy/proxy_cluster_role.yaml
-
-  ## Copy new roles
-  CLUSTER_PROXY_ROLES=https://raw.githubusercontent.com/che-incubator/devworkspace-che-operator/main/deploy/deployment/openshift/objects/devworkspace-che-proxy-role.ClusterRole.yaml
-  CONTENT=$(curl -sL $CLUSTER_PROXY_ROLES | sed '1,/rules:/d')
-  while IFS= read -r line; do
-    echo "$line" >> $ROOT_PROJECT_DIR/deploy/proxy_cluster_role.yaml
-  done <<< "$CONTENT"
 }
 
 updateOperatorYaml() {
@@ -304,9 +292,6 @@ updateNighltyBundle() {
       done
     fi
 
-    # Fix account name
-    sed -i 's|serviceAccountName: che-operator-proxy|serviceAccountName: default|g' $NEW_CSV
-
     # Fix sample
     if [ "${platform}" == "openshift" ]; then
       echo "[INFO] Fix openshift sample"