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

Migration from 3.x.x to 4.0.0 #482

Merged
merged 12 commits into from
Aug 20, 2021
Merged

Migration from 3.x.x to 4.0.0 #482

merged 12 commits into from
Aug 20, 2021

Conversation

pb82
Copy link
Collaborator

@pb82 pb82 commented Jul 22, 2021

Description

Changes required to release 4.0.0, and make it work via OLM. This should also contain the migration guide from 3.x.x to 4.0.0.

CRDs are upgraded to v1 (from v1alpha1).

TODO

  1. Automatically upgrade CRs to v1 (see https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definition-versioning/#upgrade-existing-objects-to-a-new-stored-version)
  2. Finish migration documentation

Verification steps

  1. Install 3.10.3 via OLM
  2. Deploy Grafana and some Dashboards
  3. Uninstall 3.10.3 via OLM
  4. Apply the CatalogSource (provided below)
  5. Install 4.0.0
  6. Verify that all imported Dashboards are still present.

The following CatalogSource can be used to install 4.0.0 via OLM:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: grafana-operator-manifests
  namespace: grafana
spec:
  sourceType: grpc
  image: quay.io/grafana-operator/controller-index:v4.0.0

@pb82 pb82 requested review from NissesSenap and hubeadmin July 22, 2021 12:46
@pb82 pb82 changed the title start migration doc Migration from 3.x.x to 4.0.0 Jul 22, 2021
Comment on lines -85 to -88

# OLM
bundle
config/manifests
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, sorry. I had to make changes to those files and I think they should be in the repo.

Copy link
Collaborator

@hubeadmin hubeadmin left a comment

Choose a reason for hiding this comment

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

/lgtm

@pb82 Are you going to do TODO's in this PR as well?

Tried verifying but CRC keeps crashing :| I'll retry again tomorrow

Copy link
Collaborator

@NissesSenap NissesSenap left a comment

Choose a reason for hiding this comment

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

Great work as always @pb82!
Found a few things that I'm wondering about.

Except the files already changed I think we should remove grafana-operator v3 specific stuff like:
https://github.com/grafana-operator/grafana-operator/blob/master/deploy/operator.yaml
Or if not remove at least rename the folder to v3 or legacy to naturally point people to V4.

Or do we want to use those files for deployment in the future as well? Would could write a small shell script that generates the files using kustomize build command.

Depending on what we choose here we need to update the docs as well.

@NissesSenap NissesSenap force-pushed the migration-from-3.x branch 2 times, most recently from 93c5949 to 9ff7641 Compare July 27, 2021 18:26
@pb82 pb82 force-pushed the migration-from-3.x branch 2 times, most recently from 1654911 to 4d90d97 Compare August 3, 2021 10:12
Copy link
Collaborator

@NissesSenap NissesSenap left a comment

Choose a reason for hiding this comment

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

Upgrade documentation thoughts:

documentation/upgrade.md Show resolved Hide resolved
documentation/upgrade.md Outdated Show resolved Hide resolved
documentation/upgrade.md Show resolved Hide resolved
@pb82
Copy link
Collaborator Author

pb82 commented Aug 20, 2021

@NissesSenap @HubertStefanski all feedback addressed, are you ok to merge this?

@NissesSenap
Copy link
Collaborator

LGTM
Great job and perfect timing with the new 1.22 release 🥇

@pb82 pb82 merged commit 2531a1e into grafana:master Aug 20, 2021
@pb82 pb82 deleted the migration-from-3.x branch August 20, 2021 12:59
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.

3 participants