diff --git a/Makefile b/Makefile index 8e6a15bf..78505ae5 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.2 +VERSION ?= 1.0.3 # 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 8aee803e..c5bcae29 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ Tang operator-bundle are: - v1.0.0: GA release candidate - v1.0.1: new GA release candidate. Update Go version (1.16->1.21) and dependencies - v1.0.2: new GA release candidate. Fix CVE-2023-39325 +- v1.0.3: new GA release candidate. Update all mods to latest version ## Installation @@ -106,23 +107,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.2**, the command to execute +bundle. For example, in case latest version is **1.0.3**, the command to execute will be: ```bash -$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.2 --index-image=quay.io/operator-framework/opm:v1.23.0 -INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.2 +$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.3 --index-image=quay.io/operator-framework/opm:v1.23.0 +INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.3 INFO[0009] Created CatalogSource: tang-operator-catalog INFO[0009] OperatorGroup "operator-sdk-og" created -INFO[0009] Created Subscription: tang-operator-v1.0.2-sub -INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.2-sub +INFO[0009] Created Subscription: tang-operator-v1.0.3-sub +INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.3-sub INFO[0011] Waiting for ClusterServiceVersion to reach 'Succeeded' phase -INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.2" -INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.2" phase: Pending -INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.2" phase: InstallReady -INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.2" phase: Installing -INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.2" phase: Succeeded -INFO[0031] OLM has successfully installed "tang-operator.v1.0.2" +INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.3" +INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Pending +INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: InstallReady +INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Installing +INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Succeeded +INFO[0031] OLM has successfully installed "tang-operator.v1.0.3" ``` To install latest multi-arch image, execute: ```bash @@ -138,10 +139,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.2 --index-image=quay.io/operator-framework/opm:v1.23.0 -INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.2 +$ operator-sdk run bundle --timeout 3m quay.io/sec-eng-special/tang-operator-bundle:v1.0.3 --index-image=quay.io/operator-framework/opm:v1.23.0 +INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.3 ... -INFO[0031] OLM has successfully installed "tang-operator.v1.0.2" +INFO[0031] OLM has successfully installed "tang-operator.v1.0.3" ``` Additionally, correct Tang operator installation can be observed if an output like @@ -151,7 +152,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.2 1/1 Running 0 90s +quay-io-tang-operator-bundle-v1.0.3 1/1 Running 0 90s tang-operator-controller-manager-5c9488d8dd-mgmsf 2/2 Running 0 52s ``` @@ -198,19 +199,19 @@ 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.2**, +To summarize, taking into account that the last released version is **v1.0.3**, compilation can be done with next command: ```bash -$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.2" +$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.2 -docker push sec-eng-special/tang-operator:v1.0.2 +Successfully tagged sec-eng-special/tang-operator:v1.0.3 +docker push sec-eng-special/tang-operator:v1.0.3 The push refers to repository [quay.io/sec-eng-special/tang-operator] 79109912085a: Pushed 417cb9b79ade: Layer already exists -v1.0.2: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.3: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` In case a new release is planned to be done, the steps to follow will be: @@ -226,15 +227,15 @@ index 9a41c6a..db12a82 100644 @@ -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.2) -# - use environment variables to overwrite this value (e.g export VERSION=1.0.2) +# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=1.0.3) +# - use environment variables to overwrite this value (e.g export VERSION=1.0.3) -VERSION ?= 0.0.27 -+VERSION ?= 1.0.2 ++VERSION ?= 1.0.3 ``` 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.2 quay.io/sec-eng-special/tang-operator-bundle:latest +$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.3 quay.io/sec-eng-special/tang-operator-bundle:latest $ docker push quay.io/sec-eng-special/tang-operator-bundle:latest ``` @@ -244,14 +245,14 @@ 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.2" +$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3" ... -Successfully tagged sec-eng-special/tang-operator:v1.0.2 -docker push sec-eng-special/tang-operator:v1.0.2 +Successfully tagged sec-eng-special/tang-operator:v1.0.3 +docker push sec-eng-special/tang-operator:v1.0.3 The push refers to repository [quay.io/sec-eng-special/tang-operator] 9ff8a4099c67: Pushed 417cb9b79ade: Layer already exists -v1.0.2: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739 +v1.0.3: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739 ``` - Bundle push: @@ -261,15 +262,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.2" -$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.2" +$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.3" +$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.3" ... -docker push sec-eng-special/tang-operator-bundle:v1.0.2 +docker push sec-eng-special/tang-operator-bundle:v1.0.3 The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle] 02e3768cfc56: Pushed df0c8060d328: Pushed 84774958bcf4: Pushed -v1.0.2: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 +v1.0.3: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939 make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator' ``` @@ -309,15 +310,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.2" +$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3" ... Successfully built 4a88ba8e6426 -Successfully tagged sec-eng-special/tang-operator:v1.0.2 -docker push sec-eng-special/tang-operator:v1.0.2 +Successfully tagged sec-eng-special/tang-operator:v1.0.3 +docker push sec-eng-special/tang-operator:v1.0.3 The push refers to repository [quay.io/sec-eng-special/tang-operator] 79109912085a: Pushed 417cb9b79ade: Layer already exists -v1.0.2: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 +v1.0.3: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739 ``` ## Cleanup @@ -327,9 +328,9 @@ recommended way: ```bash $ operator-sdk cleanup tang-operator -INFO[0001] subscription "tang-operator-v1.0.2-sub" deleted +INFO[0001] subscription "tang-operator-v1.0.3-sub" deleted INFO[0001] customresourcedefinition "tangservers.daemons.redhat.com" deleted -INFO[0002] clusterserviceversion "tang-operator.v1.0.2" deleted +INFO[0002] clusterserviceversion "tang-operator.v1.0.3" deleted INFO[0002] catalogsource "tang-operator-catalog" deleted INFO[0002] operatorgroup "operator-sdk-og" deleted INFO[0002] Operator "tang-operator" uninstalled @@ -400,11 +401,11 @@ NOTE: CI/CD is in a continuous "work in progress" state ## Scorecard -Execution of operator-sdk scorecard tests are passing completely in version v1.0.2. +Execution of operator-sdk scorecard tests are passing completely in version v1.0.3. In order to execute these tests, run next command: ```bash -$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.2 +$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.3 ... Results: Name: olm-status-descriptors diff --git a/bundle/manifests/tang-operator.clusterserviceversion.yaml b/bundle/manifests/tang-operator.clusterserviceversion.yaml index 6aa5db52..b1a9ed7c 100644 --- a/bundle/manifests/tang-operator.clusterserviceversion.yaml +++ b/bundle/manifests/tang-operator.clusterserviceversion.yaml @@ -25,10 +25,10 @@ metadata: } ] capabilities: Basic Install - createdAt: "2023-10-20T11:58:09Z" + createdAt: "2023-10-20T14:06:30Z" operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: tang-operator.v1.0.2 + name: tang-operator.v1.0.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -321,7 +321,7 @@ spec: - --leader-elect command: - /manager - image: quay.io/sec-eng-special/tang-operator:v1.0.2 + image: quay.io/sec-eng-special/tang-operator:v1.0.3 livenessProbe: httpGet: path: /healthz @@ -404,4 +404,4 @@ spec: maturity: alpha provider: name: Red Hat - version: 1.0.2 + version: 1.0.3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4c9e7f0c..f9a8898b 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.2 + newTag: v1.0.3