Skip to content

Commit 17a7115

Browse files
Kaustubh-pandeKaustubh-pande
authored
bump ocp version 4.19 to ocpVersion.list (#3719)
* bump max ocp version to 4.19 * use max ocp version for quickstart doc * use max ocp version for index image dockerfile
1 parent e63301b commit 17a7115

File tree

12 files changed

+75
-24
lines changed

12 files changed

+75
-24
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ require (
8888
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8989
github.com/golang/protobuf v1.5.4 // indirect
9090
github.com/golang/snappy v0.0.4 // indirect
91-
github.com/google/go-containerregistry v0.17.0 // indirect
92-
github.com/google/gofuzz v1.2.0 // indirect
91+
github.com/google/go-containerregistry v0.19.2 // indirect
92+
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
9393
github.com/google/uuid v1.6.0
9494
github.com/gorilla/websocket v1.5.3 // indirect
9595
github.com/hashicorp/errwrap v1.1.0 // indirect

‎go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,12 +1083,13 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
10831083
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
10841084
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
10851085
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1086-
github.com/google/go-containerregistry v0.17.0 h1:5p+zYs/R4VGHkhyvgWurWrpJ2hW4Vv9fQI+GzdcwXLk=
1087-
github.com/google/go-containerregistry v0.17.0/go.mod h1:u0qB2l7mvtWVR5kNcbFIhFY1hLbf8eeGapA+vbFDCtQ=
1086+
github.com/google/go-containerregistry v0.19.2 h1:TannFKE1QSajsP6hPWb5oJNgKe1IKjHukIKDUmvsV6w=
1087+
github.com/google/go-containerregistry v0.19.2/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
10881088
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
10891089
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1090-
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
10911090
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
1091+
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea h1:VcIYpAGBae3Z6BVncE0OnTE/ZjlDXqtYhOZky88neLM=
1092+
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
10921093
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
10931094
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
10941095
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=

‎hack/generate/dockerfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ values[EVENTING_ISTIO_VERSION]="$(metadata.get dependencies.eventing_istio)"
2222
values[GOLANG_VERSION]="$(metadata.get requirements.golang)"
2323
values[NODEJS_VERSION]="$(metadata.get requirements.nodejs)"
2424
values[OCP_TARGET_VLIST]="$(metadata.get 'requirements.ocpVersion.label')"
25-
values[OCP_MAX_VERSION]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
25+
values[OCP_MAX_VERSION]="$(metadata.get 'requirements.ocpVersion.max')"
2626
values[PREVIOUS_VERSION]="$(metadata.get olm.replaces)"
2727
values[BUNDLE]="${SERVERLESS_BUNDLE}"
2828

‎hack/generate/override-snapshot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
EOF
5959

6060
tmp_catalog_dir=$(mktemp -d)
61-
max_ocp_version="$(metadata.get requirements.ocpVersion.max)"
61+
max_ocp_version="$(metadata.get 'requirements.ocpVersion.list[-1]')"
6262
max_ocp_version=${max_ocp_version/./}
6363
latest_index_image="${registry_quay}-fbc-${max_ocp_version}/serverless-index-${so_short_version}-fbc-${max_ocp_version}:latest"
6464

‎hack/generate/quickstart.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target="${2:?Provide a target quickstart file as arg[2]}"
99
source "$(dirname "${BASH_SOURCE[0]}")/../lib/metadata.bash"
1010

1111
declare -A vars
12-
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
12+
vars[OCP_TARGET]="$(metadata.get 'requirements.ocpVersion.max')"
1313

1414
# Start fresh
1515
cp "$template" "$target"

‎olm-catalog/serverless-operator-index/v4.19/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
ARG OPM_IMAGE=registry.ci.openshift.org/origin/4.19:operator-registry
2+
3+
FROM $OPM_IMAGE
4+
5+
LABEL operators.operatorframework.io.index.configs.v1=/configs
6+
7+
COPY catalog/ /configs
8+
9+
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
10+
11+
ENTRYPOINT ["/bin/opm"]
12+
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]

‎olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ metadata:
7878
repository: https://github.com/openshift-knative/serverless-operator
7979
support: Red Hat
8080
olm.skipRange: '>=1.35.0 <1.36.0'
81-
operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:6a6afcadc65a3f536576139170f1910627ae2372237c4a3567e4e344140c0ed1
81+
operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:3f77228d2efa3dc16347c15b12d71f3b4d054c133541ed9234fc4720b422b421
8282
labels:
8383
operatorframework.io/arch.amd64: supported
8484
operatorframework.io/arch.ppc64le: supported
@@ -836,7 +836,7 @@ spec:
836836
serviceAccountName: knative-operator
837837
containers:
838838
- name: knative-operator
839-
image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:7f94a713df362c9eb683a497cab2795bc164a15eca1061251e6d69000abd074d
839+
image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:d4b262bc60d55980fb9b48f19069c4337df4df56b95390cff52aca838b12d986
840840
readinessProbe:
841841
periodSeconds: 1
842842
httpGet:
@@ -1017,7 +1017,7 @@ spec:
10171017
- ALL
10181018
containers:
10191019
- name: knative-openshift
1020-
image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:7145262118d684f83826134cbef22da80c33c9bb5aa2b5066a021bf740c2e30f
1020+
image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:5c4b369bd33eb772ee16a174c142bde2ad92db40d6aa603e01d178897454d528
10211021
imagePullPolicy: Always
10221022
readinessProbe:
10231023
httpGet:
@@ -1215,7 +1215,7 @@ spec:
12151215
serviceAccountName: knative-openshift-ingress
12161216
containers:
12171217
- name: knative-openshift-ingress
1218-
image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:4fe46e37bec06d471fca0fcd10c982bd93ea19566d26eb071a4db71394dfe907
1218+
image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:51bb65816aecc179691a103dfa60d296c81ab3e818abf791e05fec8524546bec
12191219
imagePullPolicy: Always
12201220
ports:
12211221
- containerPort: 9090
@@ -1366,11 +1366,11 @@ spec:
13661366
- knativeeventings.operator.knative.dev
13671367
relatedImages:
13681368
- name: "knative-operator"
1369-
image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:7f94a713df362c9eb683a497cab2795bc164a15eca1061251e6d69000abd074d"
1369+
image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:d4b262bc60d55980fb9b48f19069c4337df4df56b95390cff52aca838b12d986"
13701370
- name: "knative-openshift"
1371-
image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:7145262118d684f83826134cbef22da80c33c9bb5aa2b5066a021bf740c2e30f"
1371+
image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:5c4b369bd33eb772ee16a174c142bde2ad92db40d6aa603e01d178897454d528"
13721372
- name: "knative-openshift-ingress"
1373-
image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:4fe46e37bec06d471fca0fcd10c982bd93ea19566d26eb071a4db71394dfe907"
1373+
image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:51bb65816aecc179691a103dfa60d296c81ab3e818abf791e05fec8524546bec"
13741374
- name: "IMAGE_queue-proxy"
13751375
image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:5196418edddba85ff625a2493240a39032db023ca40a4592198626b5cdd07933"
13761376
- name: "IMAGE_activator"
@@ -1476,7 +1476,7 @@ spec:
14761476
- name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate"
14771477
image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1f871827b1313ce3df7bf3bc1e3b6ffb792c5d856fdaf09c270f1476cefb3af9"
14781478
- name: "IMAGE_MUST_GATHER"
1479-
image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:6a6afcadc65a3f536576139170f1910627ae2372237c4a3567e4e344140c0ed1"
1479+
image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:3f77228d2efa3dc16347c15b12d71f3b4d054c133541ed9234fc4720b422b421"
14801480
- name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS"
14811481
image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:785124f3aca2c7be52aa3502cd0e6d2b2c8c57db4f6b40b0fa16603234903f9f"
14821482
replaces: serverless-operator.v1.35.0

‎olm-catalog/serverless-operator/project.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ requirements:
2828
- "4.16"
2929
- "4.17"
3030
- "4.18"
31+
- "4.19"
3132
min: '4.14'
33+
# max ocp version publicly available
3234
max: '4.18'
3335
label: 'v4.14'
3436
# OCP stream for kube-rbac-proxy image.

‎vendor/github.com/google/go-containerregistry/pkg/name/digest.go

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/gofuzz/.travis.yml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)