Skip to content

Commit 938b3a8

Browse files
gkurzgkurz
committed
Bump OSC version to 1.8.1
It is about time to bump for the upcoming release. Fixes: https://issues.redhat.com/browse/KATA-3488 Signed-off-by: Greg Kurz <[email protected]> (cherry picked from commit 4e8e2b0) Signed-off-by: Greg Kurz <[email protected]>
1 parent 4a32231 commit 938b3a8

11 files changed

+36
-36
lines changed

‎Makefile

+1-1
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.8.0 ## OSC_VERSION
6+
VERSION ?= 1.8.1 ## OSC_VERSION
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")

‎bundle/manifests/sandboxed-containers-operator.clusterserviceversion.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ metadata:
1313
}
1414
]
1515
capabilities: Seamless Upgrades
16-
createdAt: "2024-11-19T13:55:17Z"
16+
createdAt: "2024-11-29T15:05:07Z"
1717
features.operators.openshift.io/disconnected: "true"
1818
features.operators.openshift.io/fips-compliant: "false"
1919
features.operators.openshift.io/proxy-aware: "false"
2020
features.operators.openshift.io/tls-profiles: "false"
2121
features.operators.openshift.io/token-auth-aws: "false"
2222
features.operators.openshift.io/token-auth-azure: "false"
2323
features.operators.openshift.io/token-auth-gcp: "false"
24-
olm.skipRange: '>=1.1.0 <1.8.0'
24+
olm.skipRange: '>=1.1.0 <1.8.1'
2525
operatorframework.io/suggested-namespace: openshift-sandboxed-containers-operator
2626
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
2727
Platform Plus"]'
@@ -32,7 +32,7 @@ metadata:
3232
labels:
3333
operatorframework.io/arch.amd64: supported
3434
operatorframework.io/os.linux: supported
35-
name: sandboxed-containers-operator.v1.8.0
35+
name: sandboxed-containers-operator.v1.8.1
3636
spec:
3737
apiservicedefinitions: {}
3838
customresourcedefinitions:
@@ -411,25 +411,25 @@ spec:
411411
- name: PEERPODS_NAMESPACE
412412
value: openshift-sandboxed-containers-operator
413413
- name: RELATED_IMAGE_KATA_MONITOR
414-
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0
414+
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1
415415
- name: SANDBOXED_CONTAINERS_EXTENSION
416416
value: kata-containers
417417
- name: RELATED_IMAGE_CAA
418-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.0
418+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.1
419419
- name: RELATED_IMAGE_PEERPODS_WEBHOOK
420-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.0
420+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.1
421421
- name: RELATED_IMAGE_PODVM_BUILDER
422-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0
422+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1
423423
- name: RELATED_IMAGE_PODVM_PAYLOAD
424-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.0
424+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.1
425425
envFrom:
426426
- secretRef:
427427
name: peer-pods-secret
428428
optional: true
429429
- configMapRef:
430430
name: peer-pods-cm
431431
optional: true
432-
image: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator:v1.8.0
432+
image: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator:v1.8.1
433433
imagePullPolicy: Always
434434
name: manager
435435
ports:
@@ -525,7 +525,7 @@ spec:
525525
containers:
526526
- command:
527527
- /metrics-server
528-
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0
528+
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1
529529
name: metrics-server
530530
ports:
531531
- containerPort: 8091
@@ -591,18 +591,18 @@ spec:
591591
provider:
592592
name: Red Hat
593593
relatedImages:
594-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0
594+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1
595595
name: kata-monitor
596-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.0
596+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.1
597597
name: caa
598-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.0
598+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.1
599599
name: peerpods-webhook
600-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0
600+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1
601601
name: podvm-builder
602-
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.0
602+
- image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.1
603603
name: podvm-payload
604-
replaces: sandboxed-containers-operator.v1.7.0
605-
version: 1.8.0
604+
replaces: sandboxed-containers-operator.v1.8.0
605+
version: 1.8.1
606606
webhookdefinitions:
607607
- admissionReviewVersions:
608608
- v1

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator
16-
newTag: v1.8.0
16+
newTag: v1.8.1

‎config/manager/manager.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ spec:
7777
- name: PEERPODS_NAMESPACE
7878
value: "openshift-sandboxed-containers-operator"
7979
- name: RELATED_IMAGE_KATA_MONITOR
80-
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0 ## OSC_VERSION
80+
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1 ## OSC_VERSION
8181
- name: SANDBOXED_CONTAINERS_EXTENSION
8282
value: kata-containers
8383
- name: RELATED_IMAGE_CAA
84-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.0 ## OSC_VERSION
84+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9:1.8.1 ## OSC_VERSION
8585
- name: RELATED_IMAGE_PEERPODS_WEBHOOK
86-
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.0 ## OSC_VERSION
86+
value: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9:1.8.1 ## OSC_VERSION
8787
- name: RELATED_IMAGE_PODVM_BUILDER
88-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0 ## OSC_VERSION
88+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1 ## OSC_VERSION
8989
- name: RELATED_IMAGE_PODVM_PAYLOAD
90-
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.0 ## OSC_VERSION
90+
value: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.1 ## OSC_VERSION
9191
imagePullPolicy: Always
9292
resources:
9393
limits:

‎config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
features.operators.openshift.io/token-auth-aws: "false"
2121
features.operators.openshift.io/token-auth-azure: "false"
2222
features.operators.openshift.io/token-auth-gcp: "false"
23-
olm.skipRange: '>=1.1.0 <1.8.0'
23+
olm.skipRange: '>=1.1.0 <1.8.1'
2424
operatorframework.io/suggested-namespace: openshift-sandboxed-containers-operator
2525
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
2626
Platform Plus"]'
@@ -372,8 +372,8 @@ spec:
372372
minKubeVersion: 1.28.0
373373
provider:
374374
name: Red Hat
375-
replaces: sandboxed-containers-operator.v1.7.0
376-
version: 1.8.0
375+
replaces: sandboxed-containers-operator.v1.8.0
376+
version: 1.8.1
377377
webhookdefinitions:
378378
- admissionReviewVersions:
379379
- v1

‎config/metrics/metrics-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: metrics-server
20-
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0 ## OSC_VERSION
20+
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1 ## OSC_VERSION
2121
command: ["/metrics-server"]
2222
ports:
2323
- containerPort: 8091

‎config/peerpods/podvm/osc-podvm-create-job.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
# /podvm-binaries.tar.gz /payload/podvm-binaries.tar.gz
1616
initContainers:
1717
- name: copy
18-
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.0 ## OSC_VERSION
18+
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.1 ## OSC_VERSION
1919
command: ["/bin/sh", "-c"]
2020
args:
2121
- |
@@ -29,7 +29,7 @@ spec:
2929
- name: create
3030
# Binaries like kubectl, packer and yq are expected to be under /usr/local/bin
3131
# podvm binaries are expected to be under /payload/podvm-binaries.tar.gz
32-
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0 ## OSC_VERSION
32+
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1 ## OSC_VERSION
3333
# This image contains the following
3434
# azure-podvm-image-handler.sh script under /scripts/azure-podvm-image-handler.sh
3535
# aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh

‎config/peerpods/podvm/osc-podvm-delete-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
# aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh
2020
# sources for cloud-api-adaptor under /src/cloud-api-adaptor
2121
# Binaries like kubectl, packer and yq under /usr/local/bin
22-
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0 ## OSC_VERSION
22+
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1 ## OSC_VERSION
2323
securityContext:
2424
runAsUser: 0 # needed for container mode dnf access
2525
env:

‎config/peerpods/podvm/osc-podvm-gallery-delete-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: delete-gallery
16-
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0 ## OSC_VERSION
16+
image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1 ## OSC_VERSION
1717
securityContext:
1818
runAsUser: 0 # needed for container mode dnf access
1919
envFrom:

‎config/samples/deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
DisplayName: My Operator Catalog
88
sourceType: grpc
9-
image: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator-catalog:v1.8.0 ## OSC_VERSION
9+
image: quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator-catalog:v1.8.1 ## OSC_VERSION
1010
updateStrategy:
1111
registryPoll:
1212
interval: 5m
@@ -36,4 +36,4 @@ spec:
3636
name: sandboxed-containers-operator
3737
source: my-operator-catalog
3838
sourceNamespace: openshift-marketplace
39-
startingCSV: sandboxed-containers-operator.v1.8.0 ## OSC_VERSION
39+
startingCSV: sandboxed-containers-operator.v1.8.1 ## OSC_VERSION

‎docs/DEVELOPMENT.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ When adding a new container definition in some pod yaml, make sure to tag the `i
137137
field with `OSC_VERSION`, e.g.
138138

139139
```
140-
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0 ## OSC_VERSION
140+
image: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1 ## OSC_VERSION
141141
```
142142

143143
Do the same when adding new `RELATED_IMAGE` entries in the environment of the controller
144144
in `config/manager/manager.yaml`, e.g.
145145

146146
```
147147
- name: RELATED_IMAGE_KATA_MONITOR
148-
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.0 ## OSC_VERSION
148+
value: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9:1.8.1 ## OSC_VERSION
149149
```
150150

151151
This is a best effort to track locations where OSC version bumps should happen.

0 commit comments

Comments
 (0)