fix: remove RELATED_IMAGE_devworkspace_che_operator env var (#1014)

* fix: remove RELATED_IMAGE_devworkspace_che_operator env var * Fix setting com.redhat.openshift.versions label" Signed-off-by: Anatolii Bazko <abazko@redhat.com>
2021-08-17 15:31:12 +03:00 · 2021-08-17 15:31:12 +03:00 · 62f7a25ee4
parent 6d6ceec83b
commit 62f7a25ee4
8 changed files with 6 additions and 24 deletions
--- a/bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/next/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.35.0-280.next
+  name: eclipse-che-preview-kubernetes.v7.35.0-281.next
  namespace: placeholder
 spec:
  apiservicedefinitions: {}
@ -889,8 +889,6 @@ spec:
                        value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e
                      - name: RELATED_IMAGE_single_host_gateway_config_sidecar
                        value: quay.io/che-incubator/configbump:0.1.4
-                      - name: RELATED_IMAGE_devworkspace_che_operator
-                        value: quay.io/che-incubator/devworkspace-che-operator:next
                      - name: RELATED_IMAGE_devworkspace_controller
                        value: quay.io/devfile/devworkspace-controller:next
                      - name: RELATED_IMAGE_internal_rest_backup_server
@ -1178,4 +1176,4 @@ spec:
  maturity: stable
  provider:
    name: Eclipse Foundation
-  version: 7.35.0-280.next
+  version: 7.35.0-281.next
--- a/bundle/next/eclipse-che-preview-openshift/bundle.Dockerfile
+++ b/bundle/next/eclipse-che-preview-openshift/bundle.Dockerfile
@ -15,9 +15,6 @@ LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/

-# Managing OpenShift versions
-# LABEL com.redhat.openshift.versions=
-
 # Copy files to locations specified by labels.
 COPY manifests /manifests/
 COPY metadata /metadata/
--- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@ -76,7 +76,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.35.0-280.next
+  name: eclipse-che-preview-openshift.v7.35.0-281.next
  namespace: placeholder
 spec:
  apiservicedefinitions: {}
@ -936,8 +936,6 @@ spec:
                        value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e
                      - name: RELATED_IMAGE_single_host_gateway_config_sidecar
                        value: quay.io/che-incubator/configbump:0.1.4
-                      - name: RELATED_IMAGE_devworkspace_che_operator
-                        value: quay.io/che-incubator/devworkspace-che-operator:next
                      - name: RELATED_IMAGE_devworkspace_controller
                        value: quay.io/devfile/devworkspace-controller:next
                      - name: RELATED_IMAGE_internal_rest_backup_server
@ -1247,4 +1245,4 @@ spec:
  maturity: stable
  provider:
    name: Eclipse Foundation
-  version: 7.35.0-280.next
+  version: 7.35.0-281.next
--- a/bundle/next/eclipse-che-preview-openshift/metadata/annotations.yaml
+++ b/bundle/next/eclipse-che-preview-openshift/metadata/annotations.yaml
@ -10,9 +10,6 @@ annotations:
  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

-  # Managing OpenShift versions
-  # com.redhat.openshift.versions:
-
  # Annotations for testing.
  operators.operatorframework.io.test.mediatype.v1: scorecard+v1
  operators.operatorframework.io.test.config.v1: tests/scorecard/
--- a/bundle/stable/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/stable/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
@ -998,11 +998,8 @@ spec:
                        value: quay.io/eclipse/che--traefik@sha256:df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e
                      - name: RELATED_IMAGE_single_host_gateway_config_sidecar
                        value: quay.io/che-incubator/configbump@sha256:175ff2ba1bd74429de192c0a9facf39da5699c6da9f151bd461b3dc8624dd532
-<<<<<<< ours
-=======
                      - name: RELATED_IMAGE_devworkspace_che_operator
                        value: quay.io/che-incubator/devworkspace-che-operator@sha256:d0e89a3d0043ab54a6465ed3f61423302b7236bab4bdc6f6b61b4dd16a1310d4
->>>>>>> theirs
                      - name: RELATED_IMAGE_devworkspace_controller
                        value: quay.io/devfile/devworkspace-controller@sha256:e7e3da9a91a1f170df3cdf0acd15ff49323ad1c3aad9f88134751ec393d234c3
                      - name: RELATED_IMAGE_internal_rest_backup_server
--- a/bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/stable/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@ -1052,11 +1052,8 @@ spec:
                        value: quay.io/eclipse/che--traefik@sha256:df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e
                      - name: RELATED_IMAGE_single_host_gateway_config_sidecar
                        value: quay.io/che-incubator/configbump@sha256:175ff2ba1bd74429de192c0a9facf39da5699c6da9f151bd461b3dc8624dd532
-<<<<<<< ours
-=======
                      - name: RELATED_IMAGE_devworkspace_che_operator
                        value: quay.io/che-incubator/devworkspace-che-operator@sha256:d0e89a3d0043ab54a6465ed3f61423302b7236bab4bdc6f6b61b4dd16a1310d4
->>>>>>> theirs
                      - name: RELATED_IMAGE_devworkspace_controller
                        value: quay.io/devfile/devworkspace-controller@sha256:e7e3da9a91a1f170df3cdf0acd15ff49323ad1c3aad9f88134751ec393d234c3
                      - name: RELATED_IMAGE_internal_rest_backup_server
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@ -85,8 +85,6 @@ spec:
              value: quay.io/eclipse/che--traefik:v2.5.0-rc2-df90799aaca1ad6fb9e06d311140035d2a0c2295a4f8f508f6b55ee056bb677e
            - name: RELATED_IMAGE_single_host_gateway_config_sidecar
              value: quay.io/che-incubator/configbump:0.1.4
-            - name: RELATED_IMAGE_devworkspace_che_operator
-              value: quay.io/che-incubator/devworkspace-che-operator:next
            - name: RELATED_IMAGE_devworkspace_controller
              value: quay.io/devfile/devworkspace-controller:next
            - name: RELATED_IMAGE_internal_rest_backup_server
--- a/olm/release-olm-files.sh
+++ b/olm/release-olm-files.sh
@ -171,8 +171,8 @@ do

  if [[ ${CHANNEL} == "stable-all-namespaces" ]]; then
    # Set specific OpenShift version
-    sed -e 's/# LABEL com.redhat.openshift.versions=/LABEL com.redhat.openshift.versions="v4.8"/' -i "${BUNDLE_DOCKERFILE}"
-    sed -e 's/# com.redhat.openshift.versions:/com.redhat.openshift.versions: "v4.8"/' -i "${ANNOTATION_METADATA_YAML}"
+    echo -e "\nLABEL com.redhat.openshift.versions=\"v4.8\"" >> "${BUNDLE_DOCKERFILE}"
+    echo -e "\n  com.redhat.openshift.versions: \"v4.8\"" >> "${ANNOTATION_METADATA_YAML}"
  fi

  exit 0