Fixes

Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Jun 25, 2021 · a8cac78 · a8cac78
1 parent ee02879
commit a8cac78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
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,21 @@ metadata:
     categories: Developer Tools
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:nightly
+<<<<<<< HEAD
     createdAt: "2021-06-24T13:43:23Z"
+=======
+    createdAt: "2021-06-24T12:41:27Z"
+>>>>>>> Fixes
     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
+<<<<<<< HEAD
   name: eclipse-che-preview-kubernetes.v7.33.0-240.nightly
+=======
+  name: eclipse-che-preview-kubernetes.v7.33.0-244.nightly
+>>>>>>> Fixes
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1252,4 +1260,8 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
+<<<<<<< HEAD
   version: 7.33.0-240.nightly
+=======
+  version: 7.33.0-244.nightly
+>>>>>>> Fixes
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,7 +77,11 @@ metadata:
     categories: Developer Tools, OpenShift Optional
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:nightly
+<<<<<<< HEAD
     createdAt: "2021-06-24T13:43:34Z"
+=======
+    createdAt: "2021-06-24T12:41:34Z"
+>>>>>>> Fixes
     description: A Kube-native development solution that delivers portable and collaborative
       developer workspaces in OpenShift.
     operatorframework.io/suggested-namespace: eclipse-che

diff --git a/olm/update-resources.sh b/olm/update-resources.sh
@@ -274,8 +274,6 @@ updateNighltyBundle() {
     fi
 
     cp -f "${ROOT_PROJECT_DIR}/deploy/crds/org_v1_che_crd.yaml" "${NIGHTLY_BUNDLE_PATH}/manifests"
-
-    cp -rf $templateCRD $platformCRD
     cp -f "${ROOT_PROJECT_DIR}/deploy/crds/org.eclipse.che_chebackupserverconfigurations_crd.yaml" "${NIGHTLY_BUNDLE_PATH}/manifests/org.eclipse.che_chebackupserverconfigurations_crd.yaml"
     cp -f "${ROOT_PROJECT_DIR}/deploy/crds/org.eclipse.che_checlusterbackups_crd.yaml" "${NIGHTLY_BUNDLE_PATH}/manifests/org.eclipse.che_checlusterbackups_crd.yaml"
     cp -f "${ROOT_PROJECT_DIR}/deploy/crds/org.eclipse.che_checlusterrestores_crd.yaml" "${NIGHTLY_BUNDLE_PATH}/manifests/org.eclipse.che_checlusterrestores_crd.yaml"