Skip to content

Commit

Permalink
SECENGSP-6452: Release version v1.1.0 (#124)
Browse files Browse the repository at this point in the history
Release version v1.1.0 (Konflux release candidate)

Resolves: #123

Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
  • Loading branch information
sarroutbi authored Oct 28, 2024
1 parent 8e1f7ca commit 9aa9831
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 52 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.23.2 as builder
FROM golang:1.23 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
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.14
VERSION ?= 1.1.0

# 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
91 changes: 46 additions & 45 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ Versions released up to date of the operator and the operator-bundle are:
- v1.0.12: Fix issues reported by gosec tool
- v1.0.13: Libraries update, Update Go version (1.22.5 -> 1.23.2)
- v1.0.14: Rename tang-operator to nbde-tang-server. Use nbde.openshift.io instead of daemons.redhat.com domain
- v1.1.0: Konflux release candidate

## Installation

Expand All @@ -111,7 +112,7 @@ operator-sdk installation is described in the [Links](#links) section.

In order to deploy the latest version of the 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.14**, the command to execute
bundle. For example, in case latest version is **1.1.0**, the command to execute
will be:

```bash
Expand All @@ -132,10 +133,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/nbde-tang-server-bundle:v1.0.14
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-nbde-tang-server-bundle-v1.0.14
$ operator-sdk run bundle --timeout 3m quay.io/sec-eng-special/nbde-tang-server-bundle:v1.1.0
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-nbde-tang-server-bundle-v1.1.0
...
INFO[0031] OLM has successfully installed "nbde-tang-server.v1.0.14"
INFO[0031] OLM has successfully installed "nbde-tang-server.v1.1.0"
```

Additionally, correct installation can be observed if an output like
Expand All @@ -145,7 +146,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-nbde-tang-server-bundle-v1.0.14 1/1 Running 0 90s
quay-io-tang-nbde-tang-server-bundle-v1.1.0 1/1 Running 0 90s
nbde-tang-server-controller-manager-5c9488d8dd-mgmsf 2/2 Running 0 52s
```

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

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

In case a new release is planned to be done, the steps to follow will be:
Expand All @@ -237,23 +238,23 @@ 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.14)
# - use environment variables to overwrite this value (e.g. export VERSION=1.0.14)
# - use the VERSION as arg of the bundle target (e.g. make bundle VERSION=1.1.0)
# - use environment variables to overwrite this value (e.g. export VERSION=1.1.0)
-VERSION ?= 1.0.13
+VERSION ?= 1.0.14
+VERSION ?= 1.1.0
```

Apart from previous changes, it is recommended to generate a "latest" tag for nbde-tang-server bundle:

```bash
$ docker tag quay.io/sec-eng-special/perator-bundle:v1.0.14 quay.io/sec-eng-special/nbde-tang-server-bundle:latest
$ docker tag quay.io/sec-eng-special/perator-bundle:v1.1.0 quay.io/sec-eng-special/nbde-tang-server-bundle:latest
$ docker push quay.io/sec-eng-special/nbde-tang-server-bundle:latest
```

In case `podman` is being used:

```bash
$ podman tag quay.io/sec-eng-special/nbde-tang-server-bundle:v1.0.14 quay.io/sec-eng-special/nbde-tang-server-bundle:latest
$ podman tag quay.io/sec-eng-special/nbde-tang-server-bundle:v1.1.0 quay.io/sec-eng-special/nbde-tang-server-bundle:latest
$ podman push quay.io/sec-eng-special/nbde-tang-server-bundle:latest
```

Expand All @@ -262,28 +263,28 @@ $ podman push quay.io/sec-eng-special/nbde-tang-server-bundle:latest
Compile operator code, specifying new version, by using **make docker-build** command:

```bash
$ make docker-build docker-push IMG="quay.io/sec-eng-special/nbde-tang-server:v1.0.14"
$ make docker-build docker-push IMG="quay.io/sec-eng-special/nbde-tang-server:v1.1.0"
...
Successfully tagged sec-eng-special/nbde-tang-server:v1.0.14
docker push sec-eng-special/nbde-tang-server:v1.0.14
Successfully tagged sec-eng-special/nbde-tang-server:v1.1.0
docker push sec-eng-special/nbde-tang-server:v1.1.0
The push refers to repository [quay.io/sec-eng-special/nbde-tang-server]
9ff8a4099c67: Pushed
417cb9b79ade: Layer already exists
v1.0.14: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739
v1.1.0: 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/nbde-tang-server:v1.0.14"
$ make podman-build podman-push IMG="quay.io/sec-eng-special/nbde-tang-server:v1.1.0"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/nbde-tang-server:v1.0.14
podman push sec-eng-special/nbde-tang-server:v1.0.14
Successfully tagged sec-eng-special/nbde-tang-server:v1.1.0
podman push sec-eng-special/nbde-tang-server:v1.1.0
The push refers to repository [quay.io/sec-eng-special/nbde-tang-server]
7910991.0.14a: Pushed
7910991.1.0a: Pushed
417cb9b79ade: Layer already exists
v1.0.14: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.1.0: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
```

- <ins>Bundle push</ins>:
Expand All @@ -293,31 +294,31 @@ 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/nbde-tang-server:v1.0.14"
$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/nbde-tang-server-bundle:v1.0.14"
$ make bundle IMG="quay.io/sec-eng-special/nbde-tang-server:v1.1.0"
$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/nbde-tang-server-bundle:v1.1.0"
...
docker push sec-eng-special/nbde-tang-server-bundle:v1.0.14
docker push sec-eng-special/nbde-tang-server-bundle:v1.1.0
The push refers to repository [quay.io/sec-eng-special/nbde-tang-server-bundle]
02e3768cfc56: Pushed
df0c8060d328: Pushed
84774958bcf4: Pushed
v1.0.14: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
v1.1.0: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
```

In case `podman` has been used for container generation, bundle push must be done through `podman`.
In case the operator bundle is required to be pushed, generate the bundle with **make bundle**,
specifying appropriate image, and push it with **make podman-bundle-build podman-bundle-push**:

```bash
$ make bundle IMG="quay.io/sec-eng-special/nbde-tang-server:v1.0.14"
$ make podman-bundle-build podman-bundle-push BUNDLE_IMG="quay.io/sec-eng-special/nbde-tang-server-bundle:v1.0.14"
$ make bundle IMG="quay.io/sec-eng-special/nbde-tang-server:v1.1.0"
$ make podman-bundle-build podman-bundle-push BUNDLE_IMG="quay.io/sec-eng-special/nbde-tang-server-bundle:v1.1.0"
...
podman push sec-eng-special/nbde-tang-server-bundle:v1.0.14
podman push sec-eng-special/nbde-tang-server-bundle:v1.1.0
The push refers to repository [quay.io/sec-eng-special/nbde-tang-server-bundle]
02e3768cfc56: Pushed
df0c8060d328: Pushed
84774958bcf4: Pushed
v1.0.14: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
v1.1.0: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
```

**IMPORTANT NOTE**: After bundle generation, next change will appear on the bundle directory:
Expand Down Expand Up @@ -358,15 +359,15 @@ In order to cross compile the operator, prepend **GOARCH** with required archite
**make docker-build**:

```bash
$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/nbde-tang-server:v1.0.14"
$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/nbde-tang-server:v1.1.0"
...
Successfully built 4a88ba8e6426
Successfully tagged sec-eng-special/nbde-tang-server:v1.0.14
docker push sec-eng-special/nbde-tang-server:v1.0.14
Successfully tagged sec-eng-special/nbde-tang-server:v1.1.0
docker push sec-eng-special/nbde-tang-server:v1.1.0
The push refers to repository [quay.io/sec-eng-special/nbde-tang-server]
7910991.0.14a: Pushed
7910991.1.0a: Pushed
417cb9b79ade: Layer already exists
v1.0.14: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
v1.1.0: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
```
Examples of architectures to cross-compile are:
* `ppc64le`
Expand Down Expand Up @@ -435,7 +436,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/nbde-tang-server-bundle:v1.0.14
$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/nbde-tang-server-bundle:v1.1.0
...
Results:
Name: olm-status-descriptors
Expand All @@ -462,7 +463,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.14).
As it can be observed, execution of operator-sdk scorecard tests are passing successfully in latest released version (v1.1.0).

## Links

Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/nbde-tang-server.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2024-10-18T10:17:01Z"
createdAt: "2024-10-28T12:14:13Z"
operators.operatorframework.io/builder: operator-sdk-v1.37.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: nbde-tang-server.v1.0.14
name: nbde-tang-server.v1.1.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -328,7 +328,7 @@ spec:
- --leader-elect
command:
- /manager
image: quay.io/sec-eng-special/nbde-tang-server:v1.0.14
image: quay.io/sec-eng-special/nbde-tang-server:v1.1.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -411,4 +411,4 @@ spec:
maturity: alpha
provider:
name: Red Hat
version: 1.0.14
version: 1.1.0
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/nbde-tang-server
newTag: v1.0.14
newTag: v1.1.0

0 comments on commit 9aa9831

Please sign in to comment.