Tenant Duplication when restoring Databases

[MStokluska]

Jira: https://issues.redhat.com/browse/THREESCALE-8497

What

Added logic to support restoration from tenant CR when the tenant already exists in the database.

Verification

Pre-reqs

• OCP/OSD cluster

Steps

1. Create namespace

oc new-project threescale

2. Apply CRDs

make install

3. Create dummy secret

oc apply -f - <<EOF   
---
apiVersion: v1
kind: Secret
metadata:
  creationTimestamp: null
  name: s3-credentials
stringData:
  AWS_ACCESS_KEY_ID: something
  AWS_SECRET_ACCESS_KEY: something
  AWS_BUCKET: something
  AWS_REGION: us-east-1
type: Opaque
EOF

4. Create APIM (update wildcard domain)

oc create -f - << EOF
apiVersion: apps.3scale.net/v1alpha1
kind: APIManager
metadata:
  name: apimanager-sample
  namespace: threescale
spec:
  system: 
    fileStorage: 
      simpleStorageService: 
        configurationSecretRef: 
          name: s3-credentials
  wildcardDomain: <WILDCARD>

EOF

5. Run the operator

WATCH_NAMESPACE=threescale make run

6. Wait for 3scale to fully provision
7. Login to master portal (only 1 acc under accounts tab should be present)
8. Create Tenant CR and secret (edit master portal URL before posting)

oc apply -f - <<EOF
---
apiVersion: v1
kind: Secret
metadata:
  name: example-admin-secret
type: Opaque
stringData:
  admin_password: "password"
---
apiVersion: capabilities.3scale.net/v1alpha1
kind: Tenant
metadata:
  name: example-tenant
spec:
  username: admin
  systemMasterUrl: <MASTER PORTAL URL>
  email: admin@example.com
  organizationName: example
  masterCredentialsRef:
    name: system-seed
  passwordCredentialsRef:
    name: example-admin-secret
  tenantSecretRef:
    name: example-tenant-secret
EOF

9. The tenant CR should get updated with annotation tenantID
10. Verify you can log in to the tenant portal (ID: admin, PASSWORD: password)
11. In the CR, change the annotation tenantID value to some random value, the annotation value should get reverted to match the actual status.tenantID
12. Copy the ObjectMetadata and Spec of tenantCR
13. Stop the operator
14. Remove the existing tenant CR + manually remove the finalizer since operator is no longer working and we don't want the tenant to be removed from the db
15. Create the tenant CR from step 12 - reduce the object metadata that's not necessary (creation timestamp, uid etc, leave the name, annotations and finalizers)
16. Run the operator again
17. The tenant CR should get updated with the correct ID and tenant should not be re-created but linked to the existing one (verify in the master portal that you have only 2 tenants)

[codeclimate]

Code Climate has analyzed commit 8f20dcf and detected 0 issues on this pull request.

View more on Code Climate.

[austincunningham]

👀

[carlkyrillos]

I was unable to verify using the above verification steps because of an issue with the porta client not working with Tenant CRs - this issue is tracked by THREESCALE-10089.

However I was able to verify this PR by first installing 0.11.6 from the marketplace, scaling down the operator, and then running the operator locally, (I also needed to cancel new rollouts for system-app and system-mysql). After that I was able to verify the changes successfully.

/lgtm

[austincunningham]

/lgtm
happy with the verification done by Carl