From 4afabbff9742f5dd875393086ea4d286ae5cfb35 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Date: Thu, 28 Mar 2024 11:36:17 +0100 Subject: [PATCH] Release 1.0.8 (ServiceType/ClusterIP CRD config) Resolves: #274 Signed-off-by: Sergio Arroutbi --- Makefile | 2 +- README.md | 117 +++++++++--------- .../tang-operator.clusterserviceversion.yaml | 8 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 65 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index dde55147..0987f2e4 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 1.0.7 +VERSION ?= 1.0.8 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/README.md b/README.md index 3e7fccd5..a6b073e1 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ Tang operator-bundle are: - v1.0.5: new GA release candidate. Use latest `kube-rbac-proxy` version - v1.0.6: GA release. Fix Url to URL in CRD. GA Released Version in OpenShift - v1.0.7: GA re-release. Fix channel ("alpha" to "stable") +- v1.0.8: ServiceType / ClusterIP configuration through TangServer CR ## Installation @@ -115,23 +116,23 @@ operator-sdk installation is described in the [Links](#links) section. In order to deploy the latest version of the Tang operator, check latest released version in the [Versions](#versions) section, and install the appropriate version -bundle. For example, in case latest version is **1.0.7**, the command to execute +bundle. For example, in case latest version is **1.0.8**, the command to execute will be: ```bash -$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 -INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.7 +$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.8 +INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.8 INFO[0009] Created CatalogSource: tang-operator-catalog INFO[0009] OperatorGroup "operator-sdk-og" created -INFO[0009] Created Subscription: tang-operator-v1.0.7-sub -INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.7-sub +INFO[0009] Created Subscription: tang-operator-v1.0.8-sub +INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.8-sub INFO[0011] Waiting for ClusterServiceVersion to reach 'Succeeded' phase -INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.7" -INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.7" phase: Pending -INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.7" phase: InstallReady -INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.7" phase: Installing -INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.7" phase: Succeeded -INFO[0031] OLM has successfully installed "tang-operator.v1.0.7" +INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.8" +INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.8" phase: Pending +INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.8" phase: InstallReady +INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.8" phase: Installing +INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.8" phase: Succeeded +INFO[0031] OLM has successfully installed "tang-operator.v1.0.8" ``` To install latest multi-arch image, execute: ```bash @@ -147,10 +148,10 @@ your cluster takes long time to deploy. To do so, the option **--timeout** can b used (if not used, default time is 2m, which stands for two minutes): ```bash -$ operator-sdk run bundle --timeout 3m quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 -INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.7 +$ operator-sdk run bundle --timeout 3m quay.io/sec-eng-special/tang-operator-bundle:v1.0.8 +INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.8 ... -INFO[0031] OLM has successfully installed "tang-operator.v1.0.7" +INFO[0031] OLM has successfully installed "tang-operator.v1.0.8" ``` Additionally, correct Tang operator installation can be observed if an output like @@ -160,7 +161,7 @@ the following is observed when prompting for installed pods: $ oc get pods NAME READY STATUS RESTARTS AGE dbbd1837106ec169542546e7ad251b95d27c3542eb0409c1e 0/1 Completed 0 82s -quay-io-tang-operator-bundle-v1.0.7 1/1 Running 0 90s +quay-io-tang-operator-bundle-v1.0.8 1/1 Running 0 90s tang-operator-controller-manager-5c9488d8dd-mgmsf 2/2 Running 0 52s ``` @@ -211,33 +212,33 @@ to be released, it is recommended to increase version appropriately. In this case, same version is used. Last released version can be observed in [Versions](#versions) section. -To summarize, taking into account that the last released version is **v1.0.7**, +To summarize, taking into account that the last released version is **v1.0.8**, compilation can be done with next command: ```bash -$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" +$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.7 -docker push sec-eng-special/tang-operator:v1.0.7 +Successfully tagged sec-eng-special/tang-operator:v1.0.8 +docker push sec-eng-special/tang-operator:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator] -7910991.0.7a: Pushed +7910991.0.8a: Pushed 417cb9b79ade: Layer already exists -v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.8: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` It is possible to use `podman` instead of `docker`: ```bash -$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" +$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.7 -podman push sec-eng-special/tang-operator:v1.0.7 +Successfully tagged sec-eng-special/tang-operator:v1.0.8 +podman push sec-eng-special/tang-operator:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator] -7910991.0.7a: Pushed +7910991.0.8a: Pushed 417cb9b79ade: Layer already exists -v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.8: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` In case a new release is planned to be done, the steps to follow will be: @@ -247,29 +248,29 @@ In case a new release is planned to be done, the steps to follow will be: ```bash $ git diff Makefile diff --git a/Makefile b/Makefile -index 9a41c6a..db12a82 1.0.74 +index 9a41c6a..db12a82 1.0.84 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the # standard setup, you can: -# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=1.0.7) -# - use environment variables to overwrite this value (e.g export VERSION=1.0.7) +# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=1.0.8) +# - use environment variables to overwrite this value (e.g export VERSION=1.0.8) -VERSION ?= 1.0.6 -+VERSION ?= 1.0.7 ++VERSION ?= 1.0.8 ``` Apart from previous changes, it is recommended to generate a "latest" tag for tang-operator bundle: ```bash -$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 quay.io/sec-eng-special/tang-operator-bundle:latest +$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.8 quay.io/sec-eng-special/tang-operator-bundle:latest $ docker push quay.io/sec-eng-special/tang-operator-bundle:latest ``` In case `podman` is being used: ```bash -$ podman tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 quay.io/sec-eng-special/tang-operator-bundle:latest +$ podman tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.8 quay.io/sec-eng-special/tang-operator-bundle:latest $ podman push quay.io/sec-eng-special/tang-operator-bundle:latest ``` @@ -279,28 +280,28 @@ Compile Tang operator code, specifying new version, by using **make docker-build** command: ```bash -$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" +$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" ... -Successfully tagged sec-eng-special/tang-operator:v1.0.7 -docker push sec-eng-special/tang-operator:v1.0.7 +Successfully tagged sec-eng-special/tang-operator:v1.0.8 +docker push sec-eng-special/tang-operator:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator] 9ff8a4099c67: Pushed 417cb9b79ade: Layer already exists -v1.0.7: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739 +v1.0.8: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739 ``` And, in case `podman` is being used instead of `docker`: ```bash -$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" +$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.7 -podman push sec-eng-special/tang-operator:v1.0.7 +Successfully tagged sec-eng-special/tang-operator:v1.0.8 +podman push sec-eng-special/tang-operator:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator] -7910991.0.7a: Pushed +7910991.0.8a: Pushed 417cb9b79ade: Layer already exists -v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.8: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` - Bundle push: @@ -310,15 +311,15 @@ the bundle with **make bundle**, specifying appropriate image, and push it with **make bundle-build bundle-push**: ```bash -$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" -$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.7" +$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" +$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.8" ... -docker push sec-eng-special/tang-operator-bundle:v1.0.7 +docker push sec-eng-special/tang-operator-bundle:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle] 02e3768cfc56: Pushed df0c8060d328: Pushed 84774958bcf4: Pushed -v1.0.7: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 +v1.0.8: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator' ``` @@ -327,15 +328,15 @@ In case the operator bundle is required to be pushed, generate the bundle with * specifying appropriate image, and push it with **make podman-bundle-build podman-bundle-push**: ```bash -$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" -$ make podman-bundle-build podman-bundle-push BUNDLE_IMG="quay.io/sarroutb/tang-operator-bundle:v1.0.7" +$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" +$ make podman-bundle-build podman-bundle-push BUNDLE_IMG="quay.io/sarroutb/tang-operator-bundle:v1.0.8" ... -podman push sec-eng-special/tang-operator-bundle:v1.0.7 +podman push sec-eng-special/tang-operator-bundle:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle] 02e3768cfc56: Pushed df0c8060d328: Pushed 84774958bcf4: Pushed -v1.0.7: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 +v1.0.8: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator' ``` @@ -375,15 +376,15 @@ In order to cross compile tang-operator, prepend **GOARCH** with required archit **make docker-build**: ```bash -$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7" +$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.8" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.7 -docker push sec-eng-special/tang-operator:v1.0.7 +Successfully tagged sec-eng-special/tang-operator:v1.0.8 +docker push sec-eng-special/tang-operator:v1.0.8 The push refers to repository [quay.io/sec-eng-special/tang-operator] -7910991.0.7a: Pushed +7910991.0.8a: Pushed 417cb9b79ade: Layer already exists -v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.8: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` Examples of architectures to cross-compile are: * `ppc64le` @@ -400,9 +401,9 @@ recommended way: ```bash $ operator-sdk cleanup tang-operator -INFO[0001] subscription "tang-operator-v1.0.7-sub" deleted +INFO[0001] subscription "tang-operator-v1.0.8-sub" deleted INFO[0001] customresourcedefinition "tangservers.daemons.redhat.com" deleted -INFO[0002] clusterserviceversion "tang-operator.v1.0.7" deleted +INFO[0002] clusterserviceversion "tang-operator.v1.0.8" deleted INFO[0002] catalogsource "tang-operator-catalog" deleted INFO[0002] operatorgroup "operator-sdk-og" deleted INFO[0002] Operator "tang-operator" uninstalled @@ -492,7 +493,7 @@ However, scorecard tests can be executed manually. In order to execute these tes run next command: ```bash -$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 +$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.8 ... Results: Name: olm-status-descriptors @@ -519,7 +520,7 @@ Name: olm-bundle-validation State: pass ``` -As it can be observed, execution of operator-sdk scorecard tests are passing successfully in latest released version (v1.0.7). +As it can be observed, execution of operator-sdk scorecard tests are passing successfully in latest released version (v1.0.8). ## Links diff --git a/bundle/manifests/tang-operator.clusterserviceversion.yaml b/bundle/manifests/tang-operator.clusterserviceversion.yaml index d22ddcf2..bdca6b18 100644 --- a/bundle/manifests/tang-operator.clusterserviceversion.yaml +++ b/bundle/manifests/tang-operator.clusterserviceversion.yaml @@ -25,10 +25,10 @@ metadata: } ] capabilities: Basic Install - createdAt: "2024-03-26T11:07:45Z" + createdAt: "2024-03-28T10:31:23Z" operators.operatorframework.io/builder: operator-sdk-v1.33.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: tang-operator.v1.0.7 + name: tang-operator.v1.0.8 namespace: placeholder spec: apiservicedefinitions: {} @@ -328,7 +328,7 @@ spec: - --leader-elect command: - /manager - image: quay.io/sec-eng-special/tang-operator:v1.0.7 + image: quay.io/sec-eng-special/tang-operator:v1.0.8 livenessProbe: httpGet: path: /healthz @@ -411,4 +411,4 @@ spec: maturity: alpha provider: name: Red Hat - version: 1.0.7 + version: 1.0.8 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b616c420..1899678f 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/sec-eng-special/tang-operator - newTag: v1.0.7 + newTag: v1.0.8