INTLY-6505 3scale 2.8 #570

KevFan · 2020-04-01T11:26:31Z

Description

Upgrade 3scale version to version 2.8

Jira:

There is a known issue that is preventing the completion of walkthrough 4 on 3scale 2.8:

https://issues.redhat.com/browse/THREESCALE-4851

Verification (Locally)

Install

Install RHMI from this branch
Verify 3scale sucessfully installs

Upgrade

Checkout master branch
Install RHMI
Verify 3scale installs successfully
Stop running the operator locally
Checkout this branch
Run the operator
Observe that there will be an upgrade for 3scale and that it will install and complete successfully

Verification (OLM)

Install via OLM

Change makefile ORG to your own quay.io registry
- integreatly-operator/Makefile
  
  Line 3 in 8eee7ac
  
  ORG=integreatly
Build and push RHMI image to your own registry
- make image/build/push
Replace image in csv with built image
- integreatly-operator/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml
  
  Line 44 in 8eee7ac
  
  containerImage: quay.io/integreatly/integreatly-operator:v2.0.0-rc1
- integreatly-operator/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml
  
  Line 273 in 8eee7ac
  
  image: quay.io/integreatly/integreatly-operator:v2.0.0-rc1
Push csv to your registry
- make push/csv REPO=<your_registry> QUAY_USERNAME=<your_registry> QUAY_PASSWORD=<password>
Install operator source with your registry

apiVersion: operators.coreos.com/v1
kind: OperatorSource
metadata:
  name: RHMI
  namespace: openshift-marketplace
spec:
  authorizationToken: {}
  displayName: RHMI Operators
  endpoint: 'https://quay.io/cnr'
  publisher: Integreatly Publisher
  registryNamespace: ${REPO}
  type: appregistry

Create operator namespace and setup secrets
- make cluster/prepare/project && make cluster/prepare/smtp && make cluster/prepare/dms && make cluster/prepare/pagerduty
Install RHMI from operator hub to the redhat-rhmi-operator namespace

Upgradel via OLM

Checkout master
Change makefile ORG to your own quay.io registry
- integreatly-operator/Makefile
  
  Line 3 in 8eee7ac
  
  ORG=integreatly
Push csv to your registry
- make push/csv REPO=<your_registry> QUAY_USERNAME=<your_registry> QUAY_PASSWORD=<password>
Install operator source with your registry

apiVersion: operators.coreos.com/v1
kind: OperatorSource
metadata:
  name: RHMI
  namespace: openshift-marketplace
spec:
  authorizationToken: {}
  displayName: RHMI Operators
  endpoint: 'https://quay.io/cnr'
  publisher: Integreatly Publisher
  registryNamespace: ${REPO}
  type: appregistry

Create operator namespace and setup secrets
- make cluster/prepare/project && make cluster/prepare/smtp && make cluster/prepare/dms && make cluster/prepare/pagerduty
Install RHMI from operator hub to the redhat-rhmi-operator namespace
When installation has complete, checkout this branch
Generate new csv
- Change makefile PREVIOUS_TAG to 2.0.0
- Change makefile TAG to 2.1.0
- make gen/csv
Build and push RHMI image to your own registry
- make image/build/push
Replace image in new csv with built image
- integreatly-operator/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml
  
  Line 44 in 8eee7ac
  
  containerImage: quay.io/integreatly/integreatly-operator:v2.0.0-rc1
- integreatly-operator/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml
  
  Line 273 in 8eee7ac
  
  image: quay.io/integreatly/integreatly-operator:v2.0.0-rc1
- Check that the replaces is correct
Push csv to your registry
- make push/csv REPO=<your_registry> QUAY_USERNAME=<your_registry> QUAY_PASSWORD=<password>
Remove status field of operator source created above.
Observe that there is a available upgrade for RHMI
- Would need to manually approve install plan to trigger upgrade
Observe an upgrade for 3scale is triggered and succeeds

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

This change requires a documentation update
I have added tests that prove my fix is effective or that my feature works
Verified independently on a cluster by reviewer

coveralls · 2020-04-01T11:31:11Z

Coverage increased (+0.04%) to 58.405% when pulling 20068af on KevFan:INTLY-6505-3scale-2.8 into c444b66 on integr8ly:master.

KevFan · 2020-04-06T16:13:53Z

@jjaferson @philbrookes Noticed something visually wrong after an upgrade for 3scale, where the version is not updated in the RHMI CR afterwards. I think it's due to this config map, where we get and set the product version from is not updated by the 3scale operator to the latest version.

integreatly-operator/pkg/products/threescale/reconciler.go

Lines 894 to 900 in 2a3f319

    
           cm := &corev1.ConfigMap{} 
        
           // if this errors it can be ignored 
        
           err := serverClient.Get(ctx, k8sclient.ObjectKey{Name: "system-environment", Namespace: r.Config.GetNamespace()}, cm) 
        
           if err == nil && string(r.Config.GetProductVersion()) != cm.Data["AMP_RELEASE"] { 
        
           	r.Config.SetProductVersion(cm.Data["AMP_RELEASE"]) 
        
           	r.ConfigManager.WriteConfig(r.Config) 
        
           }

Wondering what's your opinion on this? Update the config map to always match the version of 3scale or remove this part of the code and just always use the hardcoded version? 🤔

KevFan · 2020-04-07T13:51:09Z

/cc @jjaferson

briangallagher · 2020-04-09T18:42:01Z

/lgtm

davidffrench · 2020-04-14T09:24:24Z

@KevFan Looks like it needs a rebase

registry.stage.redhat.io -> registry.redhat.io

davidffrench

@KevFan Just one comment from me.

go.mod

…ted after upgrade

davidffrench · 2020-04-14T10:08:47Z

/lgtm
/approve

Thanks @KevFan . I have not verified, approving based on code review and previous verification

openshift-ci-robot · 2020-04-14T10:08:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: davidffrench

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [davidffrench]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

davidffrench · 2020-04-14T11:27:36Z

/test e2e

davidffrench · 2020-04-14T11:42:39Z

/test e2e

davidffrench · 2020-04-14T13:38:09Z

/test e2e

openshift-ci-robot added the do-not-merge/work-in-progress label Apr 1, 2020

KevFan changed the title ~~[WIP]INTLY-6505 3scale 2.8~~ [WIP] INTLY-6505 3scale 2.8 Apr 2, 2020

KevFan force-pushed the INTLY-6505-3scale-2.8 branch 2 times, most recently from e42349c to 1b5f35f Compare April 6, 2020 10:05

KevFan changed the title ~~[WIP] INTLY-6505 3scale 2.8~~ INTLY-6505 3scale 2.8 Apr 7, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress label Apr 7, 2020

openshift-ci-robot requested a review from jjaferson April 7, 2020 13:51

openshift-ci-robot assigned briangallagher Apr 9, 2020

openshift-ci-robot added the lgtm label Apr 9, 2020

fh-automatron and others added 4 commits April 14, 2020 10:32

Added New image Manifests

7f274a3

Replace all staging registry refs with production

89ab4bc

registry.stage.redhat.io -> registry.redhat.io

changes the use latest 3scale CRDs for install

33dd445

changes the use latest 3scale CRDs for install

df12f88

KevFan force-pushed the INTLY-6505-3scale-2.8 branch from 506f816 to 6eb395f Compare April 14, 2020 09:34

openshift-ci-robot removed the lgtm label Apr 14, 2020

davidffrench reviewed Apr 14, 2020

View reviewed changes

go.mod Outdated Show resolved Hide resolved

use hardcoded 3scale version as version in CR was not previously upda…

20068af

…ted after upgrade

KevFan force-pushed the INTLY-6505-3scale-2.8 branch from 6eb395f to 20068af Compare April 14, 2020 09:51

openshift-ci-robot assigned davidffrench Apr 14, 2020

openshift-ci-robot added the lgtm label Apr 14, 2020

openshift-ci-robot added the approved label Apr 14, 2020

openshift-merge-robot merged commit 2842433 into integr8ly:master Apr 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

INTLY-6505 3scale 2.8 #570

INTLY-6505 3scale 2.8 #570

KevFan commented Apr 1, 2020 •

edited

coveralls commented Apr 1, 2020 •

edited

KevFan commented Apr 6, 2020

KevFan commented Apr 7, 2020

briangallagher commented Apr 9, 2020

davidffrench commented Apr 14, 2020

davidffrench left a comment

davidffrench commented Apr 14, 2020

openshift-ci-robot commented Apr 14, 2020

davidffrench commented Apr 14, 2020

davidffrench commented Apr 14, 2020

davidffrench commented Apr 14, 2020

INTLY-6505 3scale 2.8 #570

INTLY-6505 3scale 2.8 #570

Conversation

KevFan commented Apr 1, 2020 • edited

Description

Verification (Locally)

Install

Upgrade

Verification (OLM)

Install via OLM

Upgradel via OLM

Type of change

Checklist

coveralls commented Apr 1, 2020 • edited

KevFan commented Apr 6, 2020

KevFan commented Apr 7, 2020

briangallagher commented Apr 9, 2020

davidffrench commented Apr 14, 2020

davidffrench left a comment

Choose a reason for hiding this comment

davidffrench commented Apr 14, 2020

openshift-ci-robot commented Apr 14, 2020

davidffrench commented Apr 14, 2020

davidffrench commented Apr 14, 2020

davidffrench commented Apr 14, 2020

KevFan commented Apr 1, 2020 •

edited

coveralls commented Apr 1, 2020 •

edited