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

Commit e5b96dd

Browse files
authored
Release GA candidate version (1.0.4) (#195)
Resolves: #194 Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
1 parent 8415013 commit e5b96dd

File tree

5 files changed

+51
-50
lines changed

5 files changed

+51
-50
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.0.3
6+
VERSION ?= 1.0.4
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

README.md

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ Tang operator-bundle are:
8686
- v1.0.1: new GA release candidate. Update Go version (1.16->1.21) and dependencies
8787
- v1.0.2: new GA release candidate. Fix CVE-2023-39325
8888
- v1.0.3: new GA release candidate. Update all mods to latest version
89+
- v1.0.4: new GA release candidate. Adjust to naming conventions
8990

9091
## Installation
9192

@@ -107,23 +108,23 @@ operator-sdk installation is described in the [Links](#links) section.
107108

108109
In order to deploy the latest version of the Tang operator, check latest released
109110
version in the [Versions](#versions) section, and install the appropriate version
110-
bundle. For example, in case latest version is **1.0.3**, the command to execute
111+
bundle. For example, in case latest version is **1.0.4**, the command to execute
111112
will be:
112113

113114
```bash
114-
$ 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
115-
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.3
115+
$ operator-sdk run bundle quay.io/sec-eng-special/tang-operator-bundle:v1.0.4 --index-image=quay.io/operator-framework/opm:v1.23.0
116+
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.4
116117
INFO[0009] Created CatalogSource: tang-operator-catalog
117118
INFO[0009] OperatorGroup "operator-sdk-og" created
118-
INFO[0009] Created Subscription: tang-operator-v1.0.3-sub
119-
INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.3-sub
119+
INFO[0009] Created Subscription: tang-operator-v1.0.4-sub
120+
INFO[0011] Approved InstallPlan install-lqf9f for the Subscription: tang-operator-v1.0.4-sub
120121
INFO[0011] Waiting for ClusterServiceVersion to reach 'Succeeded' phase
121-
INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.3"
122-
INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Pending
123-
INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: InstallReady
124-
INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Installing
125-
INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.3" phase: Succeeded
126-
INFO[0031] OLM has successfully installed "tang-operator.v1.0.3"
122+
INFO[0012] Waiting for ClusterServiceVersion "default/tang-operator.v1.0.4"
123+
INFO[0018] Found ClusterServiceVersion "default/tang-operator.v1.0.4" phase: Pending
124+
INFO[0020] Found ClusterServiceVersion "default/tang-operator.v1.0.4" phase: InstallReady
125+
INFO[0021] Found ClusterServiceVersion "default/tang-operator.v1.0.4" phase: Installing
126+
INFO[0031] Found ClusterServiceVersion "default/tang-operator.v1.0.4" phase: Succeeded
127+
INFO[0031] OLM has successfully installed "tang-operator.v1.0.4"
127128
```
128129
To install latest multi-arch image, execute:
129130
```bash
@@ -139,10 +140,10 @@ your cluster takes long time to deploy. To do so, the option **--timeout** can b
139140
used (if not used, default time is 2m, which stands for two minutes):
140141

141142
```bash
142-
$ 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
143-
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.3
143+
$ operator-sdk run bundle --timeout 3m quay.io/sec-eng-special/tang-operator-bundle:v1.0.4 --index-image=quay.io/operator-framework/opm:v1.23.0
144+
INFO[0008] Successfully created registry pod: quay-io-sec-eng-special-tang-operator-bundle-v1.0.4
144145
...
145-
INFO[0031] OLM has successfully installed "tang-operator.v1.0.3"
146+
INFO[0031] OLM has successfully installed "tang-operator.v1.0.4"
146147
```
147148

148149
Additionally, correct Tang operator installation can be observed if an output like
@@ -152,7 +153,7 @@ the following is observed when prompting for installed pods:
152153
$ oc get pods
153154
NAME READY STATUS RESTARTS AGE
154155
dbbd1837106ec169542546e7ad251b95d27c3542eb0409c1e 0/1 Completed 0 82s
155-
quay-io-tang-operator-bundle-v1.0.3 1/1 Running 0 90s
156+
quay-io-tang-operator-bundle-v1.0.4 1/1 Running 0 90s
156157
tang-operator-controller-manager-5c9488d8dd-mgmsf 2/2 Running 0 52s
157158
```
158159

@@ -199,19 +200,19 @@ to be released, it is recommended to increase version appropriately.
199200
In this case, same version is used. Last released version can be observed in
200201
[Versions](#versions) section.
201202

202-
To summarize, taking into account that the last released version is **v1.0.3**,
203+
To summarize, taking into account that the last released version is **v1.0.4**,
203204
compilation can be done with next command:
204205

205206
```bash
206-
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3"
207+
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.4"
207208
...
208209
Successfully built 4a88ba8e6426
209-
Successfully tagged sec-eng-special/tang-operator:v1.0.3
210-
docker push sec-eng-special/tang-operator:v1.0.3
210+
Successfully tagged sec-eng-special/tang-operator:v1.0.4
211+
docker push sec-eng-special/tang-operator:v1.0.4
211212
The push refers to repository [quay.io/sec-eng-special/tang-operator]
212213
79109912085a: Pushed
213214
417cb9b79ade: Layer already exists
214-
v1.0.3: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
215+
v1.0.4: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
215216
```
216217

217218
In case a new release is planned to be done, the steps to follow will be:
@@ -227,15 +228,15 @@ index 9a41c6a..db12a82 100644
227228
@@ -3,7 +3,7 @@
228229
# To re-generate a bundle for another specific version without changing the
229230
# standard setup, you can:
230-
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=1.0.3)
231-
# - use environment variables to overwrite this value (e.g export VERSION=1.0.3)
231+
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=1.0.4)
232+
# - use environment variables to overwrite this value (e.g export VERSION=1.0.4)
232233
-VERSION ?= 0.0.27
233-
+VERSION ?= 1.0.3
234+
+VERSION ?= 1.0.4
234235
```
235236

236237
Apart from previous changes, it is recommended to generate a "latest" tag for tang-operator bundle:
237238
```bash
238-
$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.3 quay.io/sec-eng-special/tang-operator-bundle:latest
239+
$ docker tag quay.io/sec-eng-special/tang-operator-bundle:v1.0.4 quay.io/sec-eng-special/tang-operator-bundle:latest
239240
$ docker push quay.io/sec-eng-special/tang-operator-bundle:latest
240241
```
241242

@@ -245,14 +246,14 @@ Compile Tang operator code, specifying new version,
245246
by using **make docker-build** command:
246247

247248
```bash
248-
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3"
249+
$ make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.4"
249250
...
250-
Successfully tagged sec-eng-special/tang-operator:v1.0.3
251-
docker push sec-eng-special/tang-operator:v1.0.3
251+
Successfully tagged sec-eng-special/tang-operator:v1.0.4
252+
docker push sec-eng-special/tang-operator:v1.0.4
252253
The push refers to repository [quay.io/sec-eng-special/tang-operator]
253254
9ff8a4099c67: Pushed
254255
417cb9b79ade: Layer already exists
255-
v1.0.3: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739
256+
v1.0.4: digest: sha256:01620ab19faae54fb382a2ff285f589cf0bde6e168f14f07 size: 739
256257
```
257258

258259
- <ins>Bundle push</ins>:
@@ -262,15 +263,15 @@ the bundle with **make bundle**, specifying appropriate image,
262263
and push it with **make bundle-build bundle-push**:
263264

264265
```bash
265-
$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.3"
266-
$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.3"
266+
$ make bundle IMG="quay.io/sec-eng-special/tang-operator:v1.0.4"
267+
$ make bundle-build bundle-push BUNDLE_IMG="quay.io/sec-eng-special/tang-operator-bundle:v1.0.4"
267268
...
268-
docker push sec-eng-special/tang-operator-bundle:v1.0.3
269+
docker push sec-eng-special/tang-operator-bundle:v1.0.4
269270
The push refers to repository [quay.io/sec-eng-special/tang-operator-bundle]
270271
02e3768cfc56: Pushed
271272
df0c8060d328: Pushed
272273
84774958bcf4: Pushed
273-
v1.0.3: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
274+
v1.0.4: digest: sha256:925c2f844f941db2b53ce45cba9db7ee0be613321da8f0f05d size: 939
274275
make[1]: Leaving directory '/home/user/RedHat/TASKS/TANG_OPERATOR/tang-operator'
275276
```
276277

@@ -310,15 +311,15 @@ In order to cross compile tang-operator, prepend **GOARCH** with required archit
310311
**make docker-build**:
311312

312313
```bash
313-
$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.3"
314+
$ GOARCH=ppc64le make docker-build docker-push IMG="quay.io/sec-eng-special/tang-operator:v1.0.4"
314315
...
315316
Successfully built 4a88ba8e6426
316-
Successfully tagged sec-eng-special/tang-operator:v1.0.3
317-
docker push sec-eng-special/tang-operator:v1.0.3
317+
Successfully tagged sec-eng-special/tang-operator:v1.0.4
318+
docker push sec-eng-special/tang-operator:v1.0.4
318319
The push refers to repository [quay.io/sec-eng-special/tang-operator]
319320
79109912085a: Pushed
320321
417cb9b79ade: Layer already exists
321-
v1.0.3: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
322+
v1.0.4: digest: sha256:c97bed08ab71556542602b008888bdf23ce4afd86228a07 size: 739
322323
```
323324

324325
## Cleanup
@@ -328,9 +329,9 @@ recommended way:
328329

329330
```bash
330331
$ operator-sdk cleanup tang-operator
331-
INFO[0001] subscription "tang-operator-v1.0.3-sub" deleted
332+
INFO[0001] subscription "tang-operator-v1.0.4-sub" deleted
332333
INFO[0001] customresourcedefinition "tangservers.daemons.redhat.com" deleted
333-
INFO[0002] clusterserviceversion "tang-operator.v1.0.3" deleted
334+
INFO[0002] clusterserviceversion "tang-operator.v1.0.4" deleted
334335
INFO[0002] catalogsource "tang-operator-catalog" deleted
335336
INFO[0002] operatorgroup "operator-sdk-og" deleted
336337
INFO[0002] Operator "tang-operator" uninstalled
@@ -401,11 +402,11 @@ NOTE: CI/CD is in a continuous "work in progress" state
401402

402403
## Scorecard
403404

404-
Execution of operator-sdk scorecard tests are passing completely in version v1.0.3.
405+
Execution of operator-sdk scorecard tests are passing completely in version v1.0.4.
405406
In order to execute these tests, run next command:
406407

407408
```bash
408-
$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.3
409+
$ operator-sdk scorecard -w 60s quay.io/sec-eng-special/tang-operator-bundle:v1.0.4
409410
...
410411
Results:
411412
Name: olm-status-descriptors

bundle/manifests/tang-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ metadata:
2525
}
2626
]
2727
capabilities: Basic Install
28-
createdAt: "2023-10-20T14:06:30Z"
28+
createdAt: "2023-10-20T19:27:44Z"
2929
operators.operatorframework.io/builder: operator-sdk-v1.32.0
3030
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
31-
name: tang-operator.v1.0.3
31+
name: tang-operator.v1.0.4
3232
namespace: placeholder
3333
spec:
3434
apiservicedefinitions: {}
@@ -176,8 +176,8 @@ spec:
176176
x-descriptors:
177177
- urn:alm:descriptor:text
178178
version: v1alpha1
179-
description: "NBDE Tang Server operator allows Tang Server deployment on OpenShift"
180-
displayName: "NBDE Tang Server"
179+
description: NBDE Tang Server operator allows Tang Server deployment on OpenShift
180+
displayName: NBDE Tang Server
181181
icon:
182182
- base64data: iVBORw0KGgoAAAANSUhEUgAAAH0AAAB9CAYAAAH4h1yzAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB+UHDQ04D0XvFmUAAAShSURBVHja7Zy/bxtlHIc/753j2nEbV2kSHFqgqcqAEFQtUqUKWJAQSLCx8B+AxMAAaiXWLjDARiUWJkZGkMoIgiKBIkWlC1IpJch1Eye4udSxE5/vZUio3MY2/nX2+fI8UqXoWuf1836+9957d29f4/u+VR8kHj3w3Xs3//dDr31++sHPjvqk719g+u2D0SvEIIVEu7988ZPcg59/unR3SN/ANBzZuLXT9HjHhdSYSGPPR6uUzUDHg06q8OwHM5o7dZTxILRSHs8UWo4HL382r6C2G9CPlwoyMkP4Bg+NBX/sKNgrEWfCSLbLQrr67k0Zt/1YEJPxINTLQieV3QmPVv9AMwi1B9K5ROitjLwGoh3BgSjCaEfQyaWikXaXjcj2wMi/QE/jQOOlrtXNBxGMzeV4pF9gpN3fcgBa+iqvlZ8rfTdgrfT6ldPRM6fxaBVccsoZzLzPcp7TOMMrmdN41O9mUsdcvXBxdt/xaqmuxY+LdDuN91Zwjtv8fUYQ2IfeefzH9ma9+fuPQU4m8tfXdeOL0r7jfsXqjS+fJnMa5y41mg8IxuqqKkk3vr6j1cVqdCys9Nw705pdOBq+vF+1qnlBdNzt7p+xOudGDfLIH0AO9KWOskceeeSZ27djUM+OBzm9Pfdh62UeJI888sj3POB13chho4U3p2Trnc2kd7YCLX+zKRkTA/lDjnLnJ5uuEGtGtVTXX99uylD2yCOP/AAZysOM/PV1/Xal1HQ9ZjN6ed1G8sgjjzzyox7tkafkER+ve/iNoqfFT9cU+j1mF6Rzri68/1S44oGv3YUIERJPHjGUOuKII4444ogjzpR1/wdSjtLziUhJHJp2u/4Mt6WII4444ogjjjjiiMdtrl4qePrl8mqknrJmjrt66aMFEkccccQRRxxxxBFnytoLNpAeu5DS1JPJjv69caQ717ZU/tsfb3FZq+xCUnNnJzsTd43++X1b5WU/1PsBznHEEUccccQRR/wATFnN3paKnc6qHKOtot90u8VWU1a/EnTXRqL7Kd5QVkR8f/mWqnc734HsxCsZPfvWPKWOOOKII4444ogjjrhYxIs4pQ5UO8SIof3fmuLyPdXuB/R4uzNwwmjm5BElJhLjH3qp4Cn/Q1kr1yqRWhMaJayVDp9w5bxtut63leEdCB0IHQid0IHQgdCB0IHQgdAhygztLdtG0ZO/zbP3tmE4RtOPZ+MTOjC8A6EDoQOhA6EDoQOhA6EDoYOGtBq2Uq6qsOTJW67R462wUjLrKncuren57PiHXvV25P1ZYwl0u8z3lkDPPJNieAdCB0IHQgdCB0IHQid0IHQgdIgViThI2LpVei6hJ17NKHc+o6A22AW+xjWqrPm6fdXT2lJVxpqxfpzMmc7wDoQOhA6EDoQOhA6EDoQOhA7DZGibEqzevid/MwitdO8Xalr5taJ62YbyiLRWCTR7JqXZ51MyrpFC6DUnaTRzKia7QEvS3MlwdzbO19cV+IGqa4GMO/jf71esJiYdHT9zjOEdCB0IHQgdCB0IHQgdCB0IHXonERcR4xolM67qWcmEUMpu0spNxWNHBTYEZniHg8C/TaaTP8oei14AAAAASUVORK5CYII=
183183
mediatype: image/png
@@ -321,7 +321,7 @@ spec:
321321
- --leader-elect
322322
command:
323323
- /manager
324-
image: quay.io/sec-eng-special/tang-operator:v1.0.3
324+
image: quay.io/sec-eng-special/tang-operator:v1.0.4
325325
livenessProbe:
326326
httpGet:
327327
path: /healthz
@@ -404,4 +404,4 @@ spec:
404404
maturity: alpha
405405
provider:
406406
name: Red Hat
407-
version: 1.0.3
407+
version: 1.0.4

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: quay.io/sec-eng-special/tang-operator
16-
newTag: v1.0.3
16+
newTag: v1.0.4

config/manifests/bases/tang-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ spec:
141141
x-descriptors:
142142
- urn:alm:descriptor:text
143143
version: v1alpha1
144-
description: "NBDE Tang Server operator allows Tang Server deployment on OpenShift"
145-
displayName: "NBDE Tang Server"
144+
description: NBDE Tang Server operator allows Tang Server deployment on OpenShift
145+
displayName: NBDE Tang Server
146146
icon:
147147
- base64data: iVBORw0KGgoAAAANSUhEUgAAAH0AAAB9CAYAAAH4h1yzAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB+UHDQ04D0XvFmUAAAShSURBVHja7Zy/bxtlHIc/753j2nEbV2kSHFqgqcqAEFQtUqUKWJAQSLCx8B+AxMAAaiXWLjDARiUWJkZGkMoIgiKBIkWlC1IpJch1Eye4udSxE5/vZUio3MY2/nX2+fI8UqXoWuf1836+9957d29f4/u+VR8kHj3w3Xs3//dDr31++sHPjvqk719g+u2D0SvEIIVEu7988ZPcg59/unR3SN/ANBzZuLXT9HjHhdSYSGPPR6uUzUDHg06q8OwHM5o7dZTxILRSHs8UWo4HL382r6C2G9CPlwoyMkP4Bg+NBX/sKNgrEWfCSLbLQrr67k0Zt/1YEJPxINTLQieV3QmPVv9AMwi1B9K5ROitjLwGoh3BgSjCaEfQyaWikXaXjcj2wMi/QE/jQOOlrtXNBxGMzeV4pF9gpN3fcgBa+iqvlZ8rfTdgrfT6ldPRM6fxaBVccsoZzLzPcp7TOMMrmdN41O9mUsdcvXBxdt/xaqmuxY+LdDuN91Zwjtv8fUYQ2IfeefzH9ma9+fuPQU4m8tfXdeOL0r7jfsXqjS+fJnMa5y41mg8IxuqqKkk3vr6j1cVqdCys9Nw705pdOBq+vF+1qnlBdNzt7p+xOudGDfLIH0AO9KWOskceeeSZ27djUM+OBzm9Pfdh62UeJI888sj3POB13chho4U3p2Trnc2kd7YCLX+zKRkTA/lDjnLnJ5uuEGtGtVTXX99uylD2yCOP/AAZysOM/PV1/Xal1HQ9ZjN6ed1G8sgjjzzyox7tkafkER+ve/iNoqfFT9cU+j1mF6Rzri68/1S44oGv3YUIERJPHjGUOuKII4444ogjzpR1/wdSjtLziUhJHJp2u/4Mt6WII4444ogjjjjiiMdtrl4qePrl8mqknrJmjrt66aMFEkccccQRRxxxxBFnytoLNpAeu5DS1JPJjv69caQ717ZU/tsfb3FZq+xCUnNnJzsTd43++X1b5WU/1PsBznHEEUccccQRR/wATFnN3paKnc6qHKOtot90u8VWU1a/EnTXRqL7Kd5QVkR8f/mWqnc734HsxCsZPfvWPKWOOOKII4444ogjjrhYxIs4pQ5UO8SIof3fmuLyPdXuB/R4uzNwwmjm5BElJhLjH3qp4Cn/Q1kr1yqRWhMaJayVDp9w5bxtut63leEdCB0IHQid0IHQgdCB0IHQgdAhygztLdtG0ZO/zbP3tmE4RtOPZ+MTOjC8A6EDoQOhA6EDoQOhA6EDoYOGtBq2Uq6qsOTJW67R462wUjLrKncuren57PiHXvV25P1ZYwl0u8z3lkDPPJNieAdCB0IHQgdCB0IHQid0IHQgdIgViThI2LpVei6hJ17NKHc+o6A22AW+xjWqrPm6fdXT2lJVxpqxfpzMmc7wDoQOhA6EDoQOhA6EDoQOhA7DZGibEqzevid/MwitdO8Xalr5taJ62YbyiLRWCTR7JqXZ51MyrpFC6DUnaTRzKia7QEvS3MlwdzbO19cV+IGqa4GMO/jf71esJiYdHT9zjOEdCB0IHQgdCB0IHQgdCB0IHXonERcR4xolM67qWcmEUMpu0spNxWNHBTYEZniHg8C/TaaTP8oei14AAAAASUVORK5CYII=
148148
mediatype: image/png

0 commit comments

Comments
 (0)