Add service catalog remover job #68

jmrodri · 2020-01-21T18:31:02Z

No description provided.

* remove configmap and config.cr * remove the old operator cluster and deployment files

* remove operator main.go * update gitignore to ignore *remover executable

jmrodri · 2020-01-21T18:33:44Z

Running it against a cluster

[jesusr@transam cluster-svcat-controller-manager-operator{remove-svcat-add-job}]$ ./cluster-svcat-controller-manager-remover 
INFO[0000] Starting openshift-service-catalog-controller-manager-remover job 
INFO[0000] ServiceCatalogControllerManager managementState is 'Removed' 
INFO[0000] Removing target namespace openshift-service-catalog-controller-manager-operator 
INFO[0000] Removing the ServiceCatalogControllerManager CR 
INFO[0000] ServiceCatalogControllerManager cr removed successfully.

See that the openshift-service-catalog-controller-manager-operator namespace is now gone.

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver-operator           Active   3h59m
openshift-service-catalog-controller-manager-remover   Active   137m

CR is gone

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager
No resources found in default namespace.

cmd/cluster-svcat-controller-manager-remover/main.go

manifests/08_remover_job.yaml

This change is motivated by a slack conversation

shawn-hurley · 2020-01-22T21:12:56Z

/retest

manifests/00_namespace.yaml

jmrodri · 2020-01-24T19:16:15Z

This PR is currently blocked by https://bugzilla.redhat.com/show_bug.cgi?id=1794823

jmrodri · 2020-01-25T05:26:43Z

TEST With the CR's `managementState` in `Managed`

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
    managementState: Managed

You can see the Service Catalog Controller Manager is running

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver                     Active   22m
openshift-service-catalog-controller-manager            Active   18s
openshift-service-catalog-controller-manager-operator   Active   34h
openshift-service-catalog-removed                       Active   35h

In the event we see a Managed CR we abort and don't do anything, this is not a condition we were expected to handle.

[jesusr@transam 0718]$ /tmp/cluster-svcat-controller-manager-remover 
INFO[0000] Starting openshift-service-catalog-controller-manager-remover job 
WARN[0000] We found a cluster-svcat-controller-manager-operator in Managed state. Aborting

As you can see nothing was touched

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver                     Active   23m
openshift-service-catalog-controller-manager            Active   115s
openshift-service-catalog-controller-manager-operator   Active   34h
openshift-service-catalog-removed                       Active   35h

The CR is still in Managed state.

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
    managementState: Managed

jmrodri · 2020-01-25T05:29:22Z

TEST With the CR's `managementState` in `Removed`

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
    managementState: Removed

With the managementState in Removed, the ServiceCatalog is not running, but the operator is.

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver-operator            Active   4m21s
openshift-service-catalog-controller-manager-operator   Active   4m21s
openshift-service-catalog-removed                       Active   35h

Running the job executable

[jesusr@transam 0718]$ /tmp/cluster-svcat-controller-manager-remover 
INFO[0000] Starting openshift-service-catalog-controller-manager-remover job 
INFO[0000] ServiceCatalogControllerManager managementState is 'Removed' 
INFO[0000] Removing target namespace openshift-service-catalog-controller-manager-operator 
INFO[0000] Removing the ServiceCatalogControllerManager CR 
INFO[0000] ServiceCatalogControllerManager cr removed successfully. 
INFO[0000] Removing the service-catalog-controller-manager clusteroperator 
INFO[0000] Removing ClusterRoleBinding: openshift-service-catalog-controller-manager-operator 
INFO[0000] Removing ClusterRole: openshift-service-catalog-controller-manager-operator

We can see the controller-manager-operator pod is Terminating, remember this job is only for the controller-manager

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver-operator            Active        5m4s
openshift-service-catalog-controller-manager-operator   Terminating   5m4s
openshift-service-catalog-removed                       Active        35h

The namespace is now gone

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver-operator       Active   5m12s
openshift-service-catalog-removed                  Active   35h

The CR is also gone

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager 
No resources found in openshift-service-catalog-apiserver-operator namespace.

jmrodri · 2020-01-25T05:32:30Z

TEST With the CR's `managementState` in `Unmanaged`

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
    managementState: Unmanaged

Here we have a running controller-manager and a CR in Unmanaged state:

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver                     Active   26m
openshift-service-catalog-controller-manager            Active   4m27s
openshift-service-catalog-controller-manager-operator   Active   34h
openshift-service-catalog-removed                       Active   35h

[jesusr@transam 0718]$ oc get pods -n openshift-service-catalog-controller-manager
NAME                       READY   STATUS    RESTARTS   AGE
controller-manager-46gpw   0/1     Running   0          4m25s
controller-manager-9kd5m   0/1     Running   3          4m27s
controller-manager-gpftj   0/1     Running   0          4m25s

Running the controller-manager job remover executable

[jesusr@transam 0718]$ /tmp/cluster-svcat-controller-manager-remover 
INFO[0000] Starting openshift-service-catalog-controller-manager-remover job 
INFO[0000] ServiceCatalogControllerManager managementState is 'Unmanaged' 
INFO[0000] Removing target namespace openshift-service-catalog-controller-manager-operator 
INFO[0000] Removing the ServiceCatalogControllerManager CR 
INFO[0000] ServiceCatalogControllerManager cr removed successfully. 
INFO[0000] Removing the service-catalog-controller-manager clusteroperator 
INFO[0000] Removing ClusterRoleBinding: openshift-service-catalog-controller-manager-operator 
INFO[0000] Removing ClusterRole: openshift-service-catalog-controller-manager-operator

We see the controller-manager-operator namespace was removed, but the openshift-service-catalog-controller-manager was untouched.

[jesusr@transam 0718]$ oc get namespaces | grep service-catalog
openshift-service-catalog-apiserver                Active   27m
openshift-service-catalog-controller-manager       Active   6m5s
openshift-service-catalog-removed                  Active   35h

[jesusr@transam 0718]$ oc get pods -n openshift-service-catalog-controller-manager
NAME                       READY   STATUS    RESTARTS   AGE
controller-manager-46gpw   0/1     Running   0          6m1s
controller-manager-9kd5m   0/1     Running   3          6m3s
controller-manager-gpftj   0/1     Running   2          6m1s

The CR is removed

[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager -o yaml | grep managementState
[jesusr@transam 0718]$ oc get ServiceCatalogControllerManager
No resources found in openshift-service-catalog-apiserver-operator namespace.

jmrodri · 2020-01-27T14:20:26Z

/test e2e-aws

camilamacedo86 · 2020-02-17T18:39:54Z

/test e2e-aws

jmrodri · 2020-02-20T02:51:18Z

/test e2e-aws

* use -f instead of -- for the clean target * switch from GOFLAGS to GO_LD_FLAGS

jmrodri · 2020-02-27T20:39:41Z

Switched to go 1.13 and go modules.

jmrodri · 2020-03-09T19:54:07Z

/retest

camilamacedo86 · 2020-03-09T20:11:57Z

go.mod

+	github.com/openshift/client-go v0.0.0-20200116152001-92a2713fa240
+	github.com/sirupsen/logrus v1.4.2
+	k8s.io/apimachinery v0.17.3-beta.0
+	k8s.io/client-go v0.17.2


Are we using these versions in SDK?

@camilamacedo86 not that I know of. But this operator doesn't use or require the SDK. So there should be no conflict between the two.

jmrodri · 2020-03-30T21:08:09Z

/retest

camilamacedo86 · 2020-03-30T22:41:29Z

Dockerfile.rhel7

@@ -1,10 +1,9 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder


Just fixing the image built 👍

camilamacedo86 · 2020-03-30T22:49:21Z

test/e2e/remover_test.go

+		t.Fatalf("%s namespace was not removed", operatorNamespaceName)
+	}
+}
+


Shows that this test are not passing. See: https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/pr-logs/pull/openshift_cluster-svcat-controller-manager-operator/68/pull-ci-openshift-cluster-svcat-controller-manager-operator-master-unit/129

shawn-hurley · 2020-03-31T15:57:53Z

/test all

shawn-hurley · 2020-03-31T21:06:25Z

/lgtm

Passed upgrades and is flaking for something else. Manually tested a 4.4.0-rc.4 upgrade with this PR.

openshift-ci-robot · 2020-03-31T21:08:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmrodri, shawn-hurley

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~~ [jmrodri,shawn-hurley]

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

openshift-bot · 2020-03-31T21:09:15Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-03-31T21:22:15Z

/retest

Please review the full test history for this PR and help us cut down flakes.

jmrodri added 13 commits January 21, 2020 13:29

Remove some of the manifest files

bdc0db6

* remove configmap and config.cr * remove the old operator cluster and deployment files

Adding the initial cut at a job

7a4a593

select namespace

ba7ad0f

update makefile to work with *-remover

dd2a10c

* remove operator main.go * update gitignore to ignore *remover executable

add job yaml file

34b70a9

remove bindata

6280e1c

ensure we remove the ServiceCatalogControllerManager CR

52d77e0

update images to have just remover

b48dada

specify the job's namespace

d84cece

remove all of the operator's code

75c0193

switch to logrus

3b4bede

trim down the deps

c0cff58

remove hack/*bindata* files

395c7d0

jmrodri requested review from joelanford and shawn-hurley January 21, 2020 18:31

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 21, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2020

joelanford reviewed Jan 21, 2020

View reviewed changes

cmd/cluster-svcat-controller-manager-remover/main.go Outdated Show resolved Hide resolved

cmd/cluster-svcat-controller-manager-remover/main.go Outdated Show resolved Hide resolved

manifests/08_remover_job.yaml Outdated Show resolved Hide resolved

jmrodri added 6 commits January 21, 2020 19:54

refactora to move common logic to functions

45f7c46

specify the serviceaccount and name

97c2d78

remove the old tests

cac8a51

add the new tests, consistent with apiserver job

af0e97c

switch namespace to openshift-service-catalog-removed

f3f0168

This change is motivated by a slack conversation

remove service-catalog-controller-manager clusteroperator

90413f9

remove ClusterRole & ClusterRoleBinding

af40b78

joelanford reviewed Jan 23, 2020

View reviewed changes

manifests/00_namespace.yaml Show resolved Hide resolved

change runlevel of job

d315601

fix test after namespace was renamed

35ad0c7

jmrodri added 4 commits February 27, 2020 15:04

use golang 1.13

5dd2337

Fix clean target and GOFLAGS error

c5f3ee5

* use -f instead of -- for the clean target * switch from GOFLAGS to GO_LD_FLAGS

bump kube to 1.17.2

536d9fe

switch to go mod and remove glide

f0f1523

jmrodri mentioned this pull request Feb 27, 2020

Don't use GOFLAGS which has special meaning in 1.13 #71

Closed

jmrodri added 2 commits February 27, 2020 22:09

add memory limit to fix qos test

d73bbe9

add securityContext

2a685f9

camilamacedo86 reviewed Mar 9, 2020

View reviewed changes

log when we finish the job

bd6a79c

camilamacedo86 reviewed Mar 30, 2020

View reviewed changes

openshift-ci-robot assigned shawn-hurley Mar 31, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2020

openshift-merge-robot merged commit 0881e2f into openshift:master Mar 31, 2020

shawn-hurley mentioned this pull request Apr 1, 2020

Revert "Add service catalog remover job" #73

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add service catalog remover job #68

Add service catalog remover job #68

jmrodri commented Jan 21, 2020

jmrodri commented Jan 21, 2020

shawn-hurley commented Jan 22, 2020

jmrodri commented Jan 24, 2020

jmrodri commented Jan 25, 2020

jmrodri commented Jan 25, 2020 •

edited

jmrodri commented Jan 25, 2020

jmrodri commented Jan 27, 2020

camilamacedo86 commented Feb 17, 2020

jmrodri commented Feb 20, 2020

jmrodri commented Feb 27, 2020

jmrodri commented Mar 9, 2020

camilamacedo86 Mar 9, 2020

jmrodri Mar 13, 2020

jmrodri commented Mar 30, 2020

camilamacedo86 Mar 30, 2020

camilamacedo86 Mar 30, 2020

shawn-hurley commented Mar 31, 2020

shawn-hurley commented Mar 31, 2020

openshift-ci-robot commented Mar 31, 2020

openshift-bot commented Mar 31, 2020

openshift-bot commented Mar 31, 2020

		@@ -1,10 +1,9 @@
		FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
		FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder

Add service catalog remover job #68

Add service catalog remover job #68

Conversation

jmrodri commented Jan 21, 2020

jmrodri commented Jan 21, 2020

shawn-hurley commented Jan 22, 2020

jmrodri commented Jan 24, 2020

jmrodri commented Jan 25, 2020

TEST With the CR's managementState in Managed

jmrodri commented Jan 25, 2020 • edited

TEST With the CR's managementState in Removed

jmrodri commented Jan 25, 2020

TEST With the CR's managementState in Unmanaged

jmrodri commented Jan 27, 2020

camilamacedo86 commented Feb 17, 2020

jmrodri commented Feb 20, 2020

jmrodri commented Feb 27, 2020

jmrodri commented Mar 9, 2020

camilamacedo86 Mar 9, 2020

Choose a reason for hiding this comment

jmrodri Mar 13, 2020

Choose a reason for hiding this comment

jmrodri commented Mar 30, 2020

camilamacedo86 Mar 30, 2020

Choose a reason for hiding this comment

camilamacedo86 Mar 30, 2020

Choose a reason for hiding this comment

shawn-hurley commented Mar 31, 2020

shawn-hurley commented Mar 31, 2020

openshift-ci-robot commented Mar 31, 2020

openshift-bot commented Mar 31, 2020

openshift-bot commented Mar 31, 2020

TEST With the CR's `managementState` in `Managed`

jmrodri commented Jan 25, 2020 •

edited

TEST With the CR's `managementState` in `Removed`

TEST With the CR's `managementState` in `Unmanaged`