Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include operator image in the release process #238

Merged
merged 1 commit into from
May 5, 2020

Conversation

tolusha
Copy link
Contributor

@tolusha tolusha commented May 4, 2020

Signed-off-by: Anatoliy Bazko abazko@redhat.com

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
Copy link
Contributor

@davidfestal davidfestal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering how we plan to manage the merge back of release branches to master (that is still required to maintain a full list of previous verisons in the OLM catalog).

@nickboldt
Copy link
Contributor

I would expect that you would run a script akin to this

which would generate the content or copy it from another branch, then push it where it needs to be.

@nickboldt
Copy link
Contributor

Aside:

still required to maintain a full list of previous verisons in the OLM catalog

Once you move to OCP 4.5 bundle format (not OCP 4.4 appregistry format) you no longer need to worry about this... old versions will be found from their source branches. Supposedly.

Copy link
Contributor

@nickboldt nickboldt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I don't understand all the changes (eg., setting tags and images to '') and what that might do for nightlies.

Perhaps @tolusha could explain?

@@ -24,7 +24,7 @@ spec:
spec:
containers:
- name: che-operator
image: quay.io/eclipse/che-operator:nightly
image: quay.io/eclipse/che-operator:7.12.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you hardcode 7.12.1 here, but in org_v1_che_cr.yaml you remove hard coding?

Copy link
Contributor

@davidfestal davidfestal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before merging we should answer this question #238 (review) or be sure that we won't merge this release branch back to master.

@tolusha
Copy link
Contributor Author

tolusha commented May 5, 2020

@davidfestal @nickboldt

Let me clarify things.
We have default image references in the deploy/operator.yaml. To override default values user has to specify image refs in the CR file. That's why we have inconsistency in the release branches.
If use tries to use a sample cr (for instance) from 7.12.1 branch and 7.12 che-operator image then he will have nightly images or che-server etc. That's why I want to remove all references from cr file.

Regarding master branch. Right now we have tags in deploy/operator.yaml in master.
https://github.com/eclipse/che-operator/blob/master/deploy/operator.yaml#L46
It means if we deploy che using nightly version of che-operator without cr file then use will have released images :( My second pr will be about removing image references in cr as well and setting nightly tags in operator yaml.

To sum up.

  • in master we will have nightly tags in operator.yaml
  • release branch we will have released version in operator.yaml
  • no image references in cr file

As usually once we release a new version:

  1. we will merge release branch into a master
  2. set nightly tags in operator.yaml

@davidfestal
Copy link
Contributor

Thanks @tolusha for this clear explanation. You're right, we're inheriting the current way from the time when default docker images were specified inside the GO source code.
Now that we specify default docker images in the YAML / manifests, I agree it seems better and more consistent to switch to the new way you're proposing.

Afaict the only new thing that we'll have to be careful about now is to switch back to nightly tags in operator.yaml after merging a release branch back to `master|. Until now it was not necessary right ?

@tolusha
Copy link
Contributor Author

tolusha commented May 5, 2020

Afaict the only new thing that we'll have to be careful about now is to switch back to nightly tags in operator.yaml after merging a release branch back to `master|. Until now it was not necessary right ?

right, I am going to automate this by creating corresponding PR after merging release branch to master

Copy link
Contributor

@davidfestal davidfestal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your answers. Approving.

@tolusha tolusha merged commit 0d00515 into 7.12.x May 5, 2020
@tolusha tolusha deleted the ab/updateOperatorImage branch May 5, 2020 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants