Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
Release 1.0.7 (GA candidate re-release) (#240)
Browse files Browse the repository at this point in the history
Resolves: #239

Signed-off-by: Sergio Arroutbi <[email protected]>
  • Loading branch information
sarroutbi authored Jan 9, 2024
1 parent b4479e9 commit 805a79a
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 69 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
VERSION ?= 1.0.7

# 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")
Expand Down
121 changes: 61 additions & 60 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ Tang operator-bundle are:
- v1.0.3: new GA release candidate. Update all mods to latest version
- v1.0.4: new GA release candidate. Adjust to naming conventions
- 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.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")

## Installation

Expand All @@ -112,23 +113,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.6**, the command to execute
bundle. For example, in case latest version is **1.0.7**, the command to execute
will be:

```bash
$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.6
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.6
$ 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
INFO[0009] Created CatalogSource: tang-operator-catalog
INFO[0009] OperatorGroup "operator-sdk-og" created
INFO[0009] Created Subscription: tang-operator-v1.0.6-sub
INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.6-sub
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[0011] Waiting for ClusterServiceVersion to reach 'Succeeded' phase
INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.6"
INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.6" phase: Pending
INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.6" phase: InstallReady
INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.6" phase: Installing
INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.6" phase: Succeeded
INFO[0031] OLM has successfully installed "tang-operator.v1.0.6"
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"
```
To install latest multi-arch image, execute:
```bash
Expand All @@ -144,10 +145,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.6
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.6
$ 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
...
INFO[0031] OLM has successfully installed "tang-operator.v1.0.6"
INFO[0031] OLM has successfully installed "tang-operator.v1.0.7"
```

Additionally, correct Tang operator installation can be observed if an output like
Expand All @@ -157,7 +158,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.6 1/1 Running 0 90s
quay-io-tang-operator-bundle-v1.0.7 1/1 Running 0 90s
tang-operator-controller-manager-5c9488d8dd-mgmsf 2/2 Running 0 52s
```

Expand Down Expand Up @@ -204,33 +205,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.6**,
To summarize, taking into account that the last released version is **v1.0.7**,
compilation can be done with next command:

```bash
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.6"
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/tang-operator:v1.0.6
docker push sec-eng-special/tang-operator:v1.0.6
Successfully tagged sec-eng-special/tang-operator:v1.0.7
docker push sec-eng-special/tang-operator:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator]
7910991.0.6a: Pushed
7910991.0.7a: Pushed
417cb9b79ade: Layer already exists
v1.0.6: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.0.7: 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.6"
$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/tang-operator:v1.0.6
podman push sec-eng-special/tang-operator:v1.0.6
Successfully tagged sec-eng-special/tang-operator:v1.0.7
podman push sec-eng-special/tang-operator:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator]
7910991.0.6a: Pushed
7910991.0.7a: Pushed
417cb9b79ade: Layer already exists
v1.0.6: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
```

In case a new release is planned to be done, the steps to follow will be:
Expand All @@ -240,29 +241,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.64
index 9a41c6a..db12a82 1.0.74
--- 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.6)
# - use environment variables to overwrite this value (e.g export VERSION=1.0.6)
-VERSION ?= 1.0.5
+VERSION ?= 1.0.6
# - 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)
-VERSION ?= 1.0.6
+VERSION ?= 1.0.7
```

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.6 quay.io/sec-eng-special/tang-operator-bundle:latest
$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 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.6 quay.io/sec-eng-special/tang-operator-bundle:latest
$ podman tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.7 quay.io/sec-eng-special/tang-operator-bundle:latest
$ podman push quay.io/sec-eng-special/tang-operator-bundle:latest
```

Expand All @@ -272,28 +273,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.6"
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7"
...
Successfully tagged sec-eng-special/tang-operator:v1.0.6
docker push sec-eng-special/tang-operator:v1.0.6
Successfully tagged sec-eng-special/tang-operator:v1.0.7
docker push sec-eng-special/tang-operator:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator]
9ff8a4099c67: Pushed
417cb9b79ade: Layer already exists
v1.0.6: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739
v1.0.7: 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.6"
$ make podman-build podman-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/tang-operator:v1.0.6
podman push sec-eng-special/tang-operator:v1.0.6
Successfully tagged sec-eng-special/tang-operator:v1.0.7
podman push sec-eng-special/tang-operator:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator]
7910991.0.6a: Pushed
7910991.0.7a: Pushed
417cb9b79ade: Layer already exists
v1.0.6: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
```

- <ins>Bundle push</ins>:
Expand All @@ -303,15 +304,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.6"
$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.6"
$ 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"
...
docker push sec-eng-special/tang-operator-bundle:v1.0.6
docker push sec-eng-special/tang-operator-bundle:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle]
02e3768cfc56: Pushed
df0c8060d328: Pushed
84774958bcf4: Pushed
v1.0.6: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
v1.0.7: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator'
```

Expand All @@ -320,15 +321,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.6"
$ make podman-bundle-build podman-bundle-push BUNDLE_IMG="quay.io/sarroutb/tang-operator-bundle:v1.0.6"
$ 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"
...
podman push sec-eng-special/tang-operator-bundle:v1.0.6
podman push sec-eng-special/tang-operator-bundle:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle]
02e3768cfc56: Pushed
df0c8060d328: Pushed
84774958bcf4: Pushed
v1.0.6: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
v1.0.7: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator'
```

Expand Down Expand Up @@ -368,15 +369,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.6"
$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.7"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/tang-operator:v1.0.6
docker push sec-eng-special/tang-operator:v1.0.6
Successfully tagged sec-eng-special/tang-operator:v1.0.7
docker push sec-eng-special/tang-operator:v1.0.7
The push refers to repository [quay.io/sec-eng-special/tang-operator]
7910991.0.6a: Pushed
7910991.0.7a: Pushed
417cb9b79ade: Layer already exists
v1.0.6: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.0.7: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
```

## Cleanup
Expand All @@ -386,9 +387,9 @@ recommended way:

```bash
$ operator-sdk cleanup tang-operator
INFO[0001] subscription "tang-operator-v1.0.6-sub" deleted
INFO[0001] subscription "tang-operator-v1.0.7-sub" deleted
INFO[0001] customresourcedefinition "tangservers.daemons.redhat.com" deleted
INFO[0002] clusterserviceversion "tang-operator.v1.0.6" deleted
INFO[0002] clusterserviceversion "tang-operator.v1.0.7" deleted
INFO[0002] catalogsource "tang-operator-catalog" deleted
INFO[0002] operatorgroup "operator-sdk-og" deleted
INFO[0002] Operator "tang-operator" uninstalled
Expand Down Expand Up @@ -465,11 +466,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.6.
Execution of operator-sdk scorecard tests are passing completely in version v1.0.7.
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.6
$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.7
...
Results:
Name: olm-status-descriptors
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=tang-operator
LABEL operators.operatorframework.io.bundle.channels.v1=stable
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
10 changes: 5 additions & 5 deletions bundle/manifests/tang-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2023-11-02T10:48:05Z"
operators.operatorframework.io/builder: operator-sdk-v1.32.0
createdAt: "2024-01-09T09:15:11Z"
operators.operatorframework.io/builder: operator-sdk-v1.33.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: tang-operator.v1.0.6
name: tang-operator.v1.0.7
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -322,7 +322,7 @@ spec:
- --leader-elect
command:
- /manager
image: quay.io/sec-eng-special/tang-operator:v1.0.6
image: quay.io/sec-eng-special/tang-operator:v1.0.7
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -405,4 +405,4 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 1.0.6
version: 1.0.7
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ annotations:
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: tang-operator
operators.operatorframework.io.bundle.channels.v1: stable
operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/sec-eng-special/tang-operator
newTag: v1.0.6
newTag: v1.0.7

0 comments on commit 805a79a

Please sign in to comment.