Skip to content

Commit be18a06

Browse files
Bump patch version for 1.36 to 1.36.1 (#3778)
* Bump patch version for 1.36 to 1.36.1 * fix lint error * use base opm as from origin/scos-4.19 * run make generated-files
1 parent 281f083 commit be18a06

File tree

19 files changed

+188
-188
lines changed

19 files changed

+188
-188
lines changed

.github/workflows/validate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ jobs:
183183
- name: Go Lint - knative-operator
184184
uses: golangci/golangci-lint-action@v6
185185
with:
186-
version: v1.61.0
186+
version: v1.64.8
187187
args: --timeout=10m0s --verbose
188188
working-directory: ./src/github.com/${{ github.repository }}
189189

knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
review:
4949
failedTaskHelp: >-
5050
This task isn’t verified yet. Try the task again, or [read
51-
more](https://docs.openshift.com/container-platform/4.18/applications/odc-viewing-application-composition-using-topology-view.html)
51+
more](https://docs.openshift.com/container-platform/4.19/applications/odc-viewing-application-composition-using-topology-view.html)
5252
about this topic.
5353
instructions: >-
5454
#### To verify the application was successfully created:
@@ -85,7 +85,7 @@ spec:
8585
review:
8686
failedTaskHelp: >-
8787
This task isn’t verified yet. Try the task again, or [read
88-
more](https://docs.openshift.com/container-platform/4.18/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
88+
more](https://docs.openshift.com/container-platform/4.19/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
8989
about this topic.
9090
instructions: >-
9191
#### To verify the application scaled down:
@@ -126,7 +126,7 @@ spec:
126126
review:
127127
failedTaskHelp: >-
128128
This task isn’t verified yet. Try the task again, or [read
129-
more](https://docs.openshift.com/container-platform/4.18/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
129+
more](https://docs.openshift.com/container-platform/4.19/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
130130
about this topic.
131131
instructions: >-
132132
#### To verify that the event connected to your Knative service:
@@ -178,7 +178,7 @@ spec:
178178
review:
179179
failedTaskHelp: >-
180180
This task isn’t verified yet. Try the task again, or [read
181-
more](https://docs.openshift.com/container-platform/4.18/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
181+
more](https://docs.openshift.com/container-platform/4.19/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
182182
about this topic.
183183
instructions: >-
184184
#### To verify that you forced a new revision and set traffic
@@ -206,7 +206,7 @@ spec:
206206
review:
207207
failedTaskHelp: >-
208208
This task is not verified yet. Try the task again, or [read
209-
more](https://docs.openshift.com/container-platform/4.18/applications/odc-deleting-applications.html)
209+
more](https://docs.openshift.com/container-platform/4.19/applications/odc-deleting-applications.html)
210210
about this topic.
211211
instructions: |-
212212
#### To verify you deleted your application: :

must-gather/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ USER 65532
2424
LABEL \
2525
com.redhat.component="openshift-serverless-1-must-gather-rhel8-container" \
2626
name="openshift-serverless-1/svls-must-gather-rhel8" \
27-
version=1.36.0 \
27+
version=1.36.1 \
2828
summary="Red Hat OpenShift Serverless 1 Must Gather" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Must Gather" \

olm-catalog/serverless-operator-index/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/origin/4.18:operator-registry AS opm
1+
FROM registry.ci.openshift.org/origin/scos-4.19:operator-registry AS opm
22

33
FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
44

@@ -9,13 +9,13 @@ COPY olm-catalog/serverless-operator-index/configs /configs
99

1010
RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
1111
RUN /bin/opm render --skip-tls-verify -o yaml \
12-
registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \
1312
registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
14-
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:0b0069fb719ddac291b359f7ce3a8274a07368a3d43f4aa693c0b08bfa61ffc0 >> /configs/index.yaml
13+
registry.ci.openshift.org/knative/release-1.36.0:serverless-bundle \
14+
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:9d54d00dc46d194f6b30648fbfcdab0f3f5f907dd7bbb6b2a884347aca537d1b >> /configs/index.yaml
1515

1616
# The base image is expected to contain
1717
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
18-
FROM registry.ci.openshift.org/origin/4.18:operator-registry
18+
FROM registry.ci.openshift.org/origin/scos-4.19:operator-registry
1919

2020
# Copy declarative config root into image at /configs
2121
COPY --from=builder /configs /configs

olm-catalog/serverless-operator-index/configs/index.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ schema: olm.channel
33
name: stable
44
package: serverless-operator
55
entries:
6+
- name: "serverless-operator.v1.36.1"
7+
replaces: "serverless-operator.v1.36.0"
8+
skipRange: ">=1.36.0 <1.36.1"
69
- name: "serverless-operator.v1.36.0"
710
replaces: "serverless-operator.v1.35.0"
811
skipRange: ">=1.35.0 <1.36.0"
9-
- name: "serverless-operator.v1.35.0"
10-
replaces: "serverless-operator.v1.34.0"
11-
skipRange: ">=1.34.0 <1.35.0"
12-
- name: serverless-operator.v1.34.0
12+
- name: serverless-operator.v1.35.0
1313
---
1414
schema: olm.channel
1515
name: stable-1.36
1616
package: serverless-operator
1717
entries:
18+
- name: "serverless-operator.v1.36.1"
19+
replaces: "serverless-operator.v1.36.0"
20+
skipRange: ">=1.36.0 <1.36.1"
1821
- name: "serverless-operator.v1.36.0"
1922
replaces: "serverless-operator.v1.35.0"
2023
skipRange: ">=1.35.0 <1.36.0"
21-
- name: "serverless-operator.v1.35.0"
22-
replaces: "serverless-operator.v1.34.0"
23-
skipRange: ">=1.34.0 <1.35.0"
24-
- name: serverless-operator.v1.34.0
24+
- name: serverless-operator.v1.35.0

olm-catalog/serverless-operator-index/v4.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.14:operator-registry
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.14:operator-registry
22

33
FROM $OPM_IMAGE
44

olm-catalog/serverless-operator-index/v4.15/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.15:operator-registry
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.15:operator-registry
22

33
FROM $OPM_IMAGE
44

olm-catalog/serverless-operator-index/v4.16/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.16:operator-registry
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.16:operator-registry
22

33
FROM $OPM_IMAGE
44

olm-catalog/serverless-operator-index/v4.17/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.17:operator-registry
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.17:operator-registry
22

33
FROM $OPM_IMAGE
44

olm-catalog/serverless-operator-index/v4.18/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.18:operator-registry
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.18:operator-registry
22

33
FROM $OPM_IMAGE
44

0 commit comments

Comments
 (0)