[release-1.32] Bump to 1.32.1 #2575

pierDipi · 2024-03-22T15:47:36Z

Update metadata for patch release

Waiting for openshift/release#50173

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi · 2024-03-22T15:48:27Z

/assign @Kaustubh-pande @mgencur

mgencur · 2024-03-25T09:43:27Z

.github/workflows/release-generate-ci.yaml

@@ -60,12 +60,12 @@ jobs:
      - name: Generate CI (on workflow dispatch)
        if: github.event_name == 'workflow_dispatch'
        working-directory: ./src/github.com/openshift-knative/hack
-        run: go run ./cmd/prowcopy --branch ${{ inputs.branch }} --tag ${{ inputs.branch }} --config config/serverless-operator.yaml
+        run: go run ./cmd/prowcopy --branch ${{ inputs.branch }} --tag "${{ inputs.branch }}.0" --config config/serverless-operator.yaml


When you're changing this, do you plan to re-generate the CI config for release-1.32 branch?

No, I don't but this is necessary moving forward to make sure that the Dockerfile olm-catalog/serverless-operator/index/Dockerfile is using the correct versioned image

pierDipi · 2024-03-25T10:20:34Z

/retest

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi · 2024-03-25T13:29:20Z

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

 name: stable-1.30
 package: serverless-operator
 entries:
-  - name: "serverless-operator.v1.30.0"
+  - name: "serverless-operator.v1.31.0"


This one doesn't seem right, @mgencur @Kaustubh-pande do you know what I'm doing wrong here ?

We need stable 1.30? already EOL?
I think you are adding serverless-operator-1.31.0 in the stable 1.30 channel

I think we leave current - 2 for the upgrade test regardless of the EOL date

I think you are adding serverless-operator-1.31.0 in the stable 1.30 channel

yes, but this is generated and I'm not sure what's wrong in the project.yaml that causes it to generate this one

Fixing it here: #2583 , The commit can be cherry-picked on release-1.32 if desired.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

lberk · 2024-03-25T18:14:18Z

/retest

matzew · 2024-03-25T18:29:20Z

hack/lib/images.bash

@@ -5,7 +5,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/metadata.bash"

 registry_host='registry.ci.openshift.org'
 registry="${registry_host}/openshift"
-export CURRENT_VERSION_IMAGES=${CURRENT_VERSION_IMAGES:-"main"}
+export CURRENT_VERSION_IMAGES=${CURRENT_VERSION_IMAGES:-"release-$(metadata.get project.version)"}


Does it make sense to use just

export CURRENT_VERSION_IMAGES="release-$(metadata.get project.version)"

and then leave the file .github/workflows/validate.yaml untouched?

matzew · 2024-03-25T18:31:02Z

olm-catalog/serverless-operator/project.yaml

-        serving: knative-v1.10
-        eventing: knative-v1.10
-        eventing_kafka_broker: knative-v1.10
+        serving: knative-v1.11


Uh, previous, as in 1.32.0 is "previous to this?

That's a weak / difficult knob, IMO. But likely subject for a different discussion

matzew

/lgtm
/approve

/hold
in cases anyone has feedback - feel free to unhold

Kaustubh-pande · 2024-03-25T19:27:30Z

/retest

matzew · 2024-03-26T07:21:06Z

/retest

pierDipi · 2024-03-26T07:22:19Z

I believe there is something wrong somewhere :(

ReToCode · 2024-03-26T08:06:10Z

I believe there is something wrong somewhere :(

yes I think I face the same here

mgencur · 2024-03-26T11:46:02Z

olm-catalog/serverless-operator/index/Dockerfile

@@ -10,7 +10,7 @@ COPY olm-catalog/serverless-operator/index/configs /configs
 RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
 RUN /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.30.0:serverless-bundle \
      registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \
-      registry.ci.openshift.org/knative/openshift-serverless-v1.32.0:serverless-bundle >> /configs/index.yaml || \
+      registry.ci.openshift.org/knative/release-1.32.1:serverless-bundle >> /configs/index.yaml || \


You will also need to update this line: https://github.com/openshift-knative/serverless-operator/blob/release-1.32/hack/lib/catalogsource.bash#L68

We're promoting to a different name/namespace now and if we don't change the line we'll end up with this command in the Dockerfile:

RUN /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.30.0:serverless-bundle \ registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.32.1:serverless-bundle >> /configs/index.yaml || \ /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/openshift-serverless-v1.30.0:serverless-bundle \ registry.ci.openshift.org/knative/openshift-serverless-v1.31.0:serverless-bundle \ registry.ci.openshift.org/knative/serverless-bundle:main >> /configs/index.yaml

And since we're on release-1.32 branch and not main, and since release-1.32.1 tag doesn't exist yet, the Index will be corrupted (the first command will fail, then the second one will run but it will only add the bundle from "main" branch).

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

mgencur · 2024-03-26T12:10:24Z

This PR should be merged after #2581

mgencur · 2024-03-26T12:42:03Z

The error is :

./hack/lib/catalogsource.bash: line 68: CURRENT_VERSION_IMAGES: unbound variable

The last commit should use CURRENT_VERSION, not CURRENT_VERSION_IMAGES

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

…cram512 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi · 2024-03-26T16:28:49Z

Upgrade test failing

{Failed  === RUN   TestServerlessUpgradePrePost/Run/Steps/DowngradeWith/DowngradeServerless
    upgrade.go:23: Serverless downgrade failed: serving downgrade failed: knativeserving knative-serving is not in desired state, got: &{TypeMeta:{Kind: APIVersion:} ObjectMeta:{Name:knative-serving GenerateName: Namespace:knative-serving SelfLink: UID:b2bbdae0-e2ef-4140-b46e-46edec842497 ResourceVersion:79236 Generation:1 CreationTimestamp:2024-03-26 15:39:08 +0000 UTC DeletionTimestamp:<nil> DeletionGracePeriodSeconds:<nil> Labels:map[] Annotations:map[kubectl.kubernetes.io/last-applied-configuration:{"apiVersion":"operator.knative.dev/v1beta1","kind":"KnativeServing","metadata":{"annotations":{},"name":"knative-serving","namespace":"knative-serving"},"spec":{"config":{"autoscaler":{"container-concurrency-target-default":"100","container-concurrency-target-percentage":"1.0","enable-scale-to-zero":"true","max-scale-up-rate":"10","panic-threshold-percentage":"200.0","panic-window":"6s","panic-window-percentage":"10.0","scale-to-zero-grace-period":"30s","stable-window":"60s","tick-interval":"2s"},"defaults":{"revision-timeout-seconds":"300"},"deployment":{"progressDeadline":"120s","registriesSkippingTagResolving":"ko.local,dev.local"},"gc":{"stale-revision-create-delay":"24h","stale-revision-lastpinned-debounce":"5h","stale-revision-minimum-generations":"1","stale-revision-timeout":"15h"},"logging":{"loglevel.activator":"debug","loglevel.autoscaler":"debug","loglevel.controller":"debug","loglevel.domainmapping":"debug","loglevel.domainmapping-webhook":"debug","loglevel.hpaautoscaler":"debug","loglevel.queueproxy":"debug","loglevel.webhook":"debug"},"network":{},"observability":{"logging.enable-probe-request-log":"true","logging.enable-request-log":"true","logging.enable-var-log-collection":"false","logging.request-log-template":"{\"httpRequest\": {\"requestMethod\": \"{{.Request.Method}}\", \"requestUrl\": \"{{js .Request.RequestURI}}\", \"requestSize\": \"{{.Request.ContentLength}}\", \"status\": {{.Response.Code}}, \"responseSize\": \"{{.Response.Size}}\", \"userAgent\": \"{{js .Request.UserAgent}}\", \"remoteIp\": \"{{js .Request.RemoteAddr}}\", \"serverIp\": \"{{.Revision.PodIP}}\", \"referer\": \"{{js .Request.Referer}}\", \"latency\": \"{{.Response.Latency}}s\", \"protocol\": \"{{.Request.Proto}}\"}, \"traceId\": \"{{index .Request.Header \"X-B3-Traceid\"}}\"}","metrics.backend-destination":"prometheus"},"tracing":{"backend":"zipkin","debug":"false","enable":"true","sample-rate":"1.0","zipkin-endpoint":"http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans"}}}}
        ] OwnerReferences:[] Finalizers:[knativeservings.operator.knative.dev knative-serving-openshift] ManagedFields:[{Manager:kubectl-client-side-apply Operation:Update APIVersion:operator.knative.dev/v1beta1 Time:2024-03-26 15:39:08 +0000 UTC FieldsType:FieldsV1 FieldsV1:{"f:metadata":{"f:annotations":{".":{},"f:kubectl.kubernetes.io/last-applied-configuration":{}}},"f:spec":{".":{},"f:config":{".":{},"f:autoscaler":{".":{},"f:container-concurrency-target-default":{},"f:container-concurrency-target-percentage":{},"f:enable-scale-to-zero":{},"f:max-scale-up-rate":{},"f:panic-threshold-percentage":{},"f:panic-window":{},"f:panic-window-percentage":{},"f:scale-to-zero-grace-period":{},"f:stable-window":{},"f:tick-interval":{}},"f:defaults":{".":{},"f:revision-timeout-seconds":{}},"f:deployment":{".":{},"f:progressDeadline":{},"f:registriesSkippingTagResolving":{}},"f:gc":{".":{},"f:stale-revision-create-delay":{},"f:stale-revision-lastpinned-debounce":{},"f:stale-revision-minimum-generations":{},"f:stale-revision-timeout":{}},"f:logging":{".":{},"f:loglevel.activator":{},"f:loglevel.autoscaler":{},"f:loglevel.controller":{},"f:loglevel.domainmapping":{},"f:loglevel.domainmapping-webhook":{},"f:loglevel.hpaautoscaler":{},"f:loglevel.queueproxy":{},"f:loglevel.webhook":{}},"f:network":{},"f:observability":{".":{},"f:logging.enable-probe-request-log":{},"f:logging.enable-request-log":{},"f:logging.enable-var-log-collection":{},"f:logging.request-log-template":{},"f:metrics.backend-destination":{}},"f:tracing":{".":{},"f:backend":{},"f:debug":{},"f:enable":{},"f:sample-rate":{},"f:zipkin-endpoint":{}}}}} Subresource:} {Manager:operator Operation:Update APIVersion:operator.knative.dev/v1beta1 Time:2024-03-26 15:39:08 +0000 UTC FieldsType:FieldsV1 FieldsV1:{"f:metadata":{"f:finalizers":{".":{},"v:\"knative-serving-openshift\"":{},"v:\"knativeservings.operator.knative.dev\"":{}}}} Subresource:} {Manager:operator Operation:Update APIVersion:operator.knative.dev/v1beta1 Time:2024-03-26 15:51:55 +0000 UTC FieldsType:FieldsV1 FieldsV1:{"f:status":{".":{},"f:conditions":{},"f:manifests":{},"f:observedGeneration":{},"f:version":{}}} Subresource:status}]} Spec:{CommonSpec:{Config:map[autoscaler:map[container-concurrency-target-default:100 container-concurrency-target-percentage:1.0 enable-scale-to-zero:true max-scale-up-rate:10 panic-threshold-percentage:200.0 panic-window:6s panic-window-percentage:10.0 scale-to-zero-grace-period:30s stable-window:60s tick-interval:2s] defaults:map[revision-timeout-seconds:300] deployment:map[progressDeadline:120s registriesSkippingTagResolving:ko.local,dev.local] gc:map[stale-revision-create-delay:24h stale-revision-lastpinned-debounce:5h stale-revision-minimum-generations:1 stale-revision-timeout:15h] logging:map[loglevel.activator:debug loglevel.autoscaler:debug loglevel.controller:debug loglevel.domainmapping:debug loglevel.domainmapping-webhook:debug loglevel.hpaautoscaler:debug loglevel.queueproxy:debug loglevel.webhook:debug] network:map[] observability:map[logging.enable-probe-request-log:true logging.enable-request-log:true logging.enable-var-log-collection:false logging.request-log-template:{"httpRequest": {"requestMethod": "{{.Request.Method}}", "requestUrl": "{{js .Request.RequestURI}}", "requestSize": "{{.Request.ContentLength}}", "status": {{.Response.Code}}, "responseSize": "{{.Response.Size}}", "userAgent": "{{js .Request.UserAgent}}", "remoteIp": "{{js .Request.RemoteAddr}}", "serverIp": "{{.Revision.PodIP}}", "referer": "{{js .Request.Referer}}", "latency": "{{.Response.Latency}}s", "protocol": "{{.Request.Proto}}"}, "traceId": "{{index .Request.Header "X-B3-Traceid"}}"} metrics.backend-destination:prometheus] tracing:map[backend:zipkin debug:false enable:true sample-rate:1.0 zipkin-endpoint:http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans]] Registry:{Default: Override:map[] ImagePullSecrets:[]} DeprecatedResources:[] DeploymentOverride:[] Workloads:[] ServiceOverride:[] Version: Manifests:[] AdditionalManifests:[] HighAvailability:<nil> PodDisruptionBudgetOverride:[]} ControllerCustomCerts:{Type: Name:} Ingress:<nil> Security:<nil>} Status:{Status:{ObservedGeneration:1 Conditions:[{Type:DependenciesInstalled Status:True Severity: LastTransitionTime:{Inner:2024-03-26 15:39:24 +0000 UTC} Reason: Message:} {Type:DeploymentsAvailable Status:True Severity: LastTransitionTime:{Inner:2024-03-26 15:40:13 +0000 UTC} Reason: Message:} {Type:InstallSucceeded Status:True Severity: LastTransitionTime:{Inner:2024-03-26 15:47:44 +0000 UTC} Reason: Message:} {Type:Ready Status:True Severity: LastTransitionTime:{Inner:2024-03-26 15:47:44 +0000 UTC} Reason: Message:} {Type:VersionMigrationEligible Status:True Severity: LastTransitionTime:{Inner:2024-03-26 15:39:08 +0000 UTC} Reason: Message:}] Annotations:map[]} Version:1.10 Manifests:[/var/run/ko/knative-serving/1.10 /var/run/ko/ingress/1.10/kourier]}}: timed out waiting for the condition
--- FAIL: TestServerlessUpgradePrePost/Run/Steps/DowngradeWith/DowngradeServerless (391.30s)

pierDipi · 2024-03-26T16:29:43Z

@mgencur do I need to also change the upgrade_sequence in project.yaml ?

mgencur · 2024-03-27T06:22:44Z

@pierDipi We need to change these lines to knative-v1.11: https://github.com/openshift-knative/serverless-operator/blob/release-1.32/olm-catalog/serverless-operator/project.yaml#L67-L69

pierDipi · 2024-03-27T07:50:31Z

Done already https://github.com/openshift-knative/serverless-operator/pull/2575/files#diff-9ec99a29b0f919b6f2fe5ce2d73dd3ac522d1e164a170ca7296936a53204b574R67

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi · 2024-03-27T17:46:15Z

/test 414-test-upgrade-aws-414

pierDipi · 2024-03-27T19:15:44Z

/unhold

mgencur · 2024-03-27T19:17:16Z

/lgtm

openshift-ci · 2024-03-27T19:17:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew, mgencur, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [matzew,mgencur,pierDipi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

pierDipi added 2 commits March 22, 2024 16:45

Update project metadata

bb4a26f

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

Generate files

9b0e5c8

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

openshift-ci bot requested review from alanfx and lberk March 22, 2024 15:47

openshift-ci bot added the approved label Mar 22, 2024

openshift-ci bot assigned Kaustubh-pande and mgencur Mar 22, 2024

pierDipi mentioned this pull request Mar 25, 2024

[release-1.32] Bump to 1.32.1 Serverless Operator openshift/release#50173

Merged

mgencur reviewed Mar 25, 2024

View reviewed changes

Fix bundle reference

f272ed1

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi force-pushed the bump-1.32.1 branch from 3fee75e to f272ed1 Compare March 25, 2024 10:23

Bump previous as we're not bumping major version during the upgrade

6bfebd8

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi commented Mar 25, 2024

View reviewed changes

pierDipi force-pushed the bump-1.32.1 branch from c529d37 to 0373d0b Compare March 25, 2024 15:18

maybe correct replace

8f2060e

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

pierDipi force-pushed the bump-1.32.1 branch from 0373d0b to 8f2060e Compare March 25, 2024 15:20

Fix current images validation

69b012a

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

matzew reviewed Mar 25, 2024

View reviewed changes

matzew approved these changes Mar 25, 2024

View reviewed changes

openshift-ci bot assigned matzew Mar 25, 2024

openshift-ci bot added do-not-merge/hold lgtm labels Mar 25, 2024

mgencur reviewed Mar 26, 2024

View reviewed changes

Fix also catalogsource built during CI

d3ea155

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

openshift-ci bot removed the lgtm label Mar 26, 2024

pierDipi added 3 commits March 26, 2024 14:20

Include images

a61fbeb

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

Add strimzi SASL restricted user for TestRestrictedBrokerAuthSslSaslS…

e4f4def

…cram512 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

Merge branch 'release-1.32' into bump-1.32.1

d1bf2f5

Update replaces and skip ranges

dcb07f1

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

mgencur mentioned this pull request Mar 27, 2024

Use promotion by name for operator images #2582

Merged

pierDipi and others added 3 commits March 27, 2024 10:10

Fix index images

6c8cfd5

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

Use serverless-openshift-knative-operator for webhook

8dbcab9

Merge branch 'release-1.32' into bump-1.32.1

3535730

openshift-ci bot removed the do-not-merge/hold label Mar 27, 2024

openshift-ci bot added the lgtm label Mar 27, 2024

openshift-merge-bot bot merged commit 5ab219d into openshift-knative:release-1.32 Mar 27, 2024
21 checks passed

pierDipi deleted the bump-1.32.1 branch March 27, 2024 19:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release-1.32] Bump to 1.32.1 #2575

[release-1.32] Bump to 1.32.1 #2575

pierDipi commented Mar 22, 2024 •

edited

Loading

pierDipi commented Mar 22, 2024

mgencur Mar 25, 2024

pierDipi Mar 25, 2024

pierDipi commented Mar 25, 2024

pierDipi Mar 25, 2024

Kaustubh-pande Mar 25, 2024

pierDipi Mar 25, 2024

mgencur Mar 27, 2024

lberk commented Mar 25, 2024

matzew Mar 25, 2024

mgencur Mar 26, 2024

matzew Mar 25, 2024

matzew left a comment

Kaustubh-pande commented Mar 25, 2024

matzew commented Mar 26, 2024

pierDipi commented Mar 26, 2024

ReToCode commented Mar 26, 2024

mgencur Mar 26, 2024

mgencur commented Mar 26, 2024

mgencur commented Mar 26, 2024

pierDipi commented Mar 26, 2024

pierDipi commented Mar 26, 2024

mgencur commented Mar 27, 2024

pierDipi commented Mar 27, 2024

pierDipi commented Mar 27, 2024

pierDipi commented Mar 27, 2024

mgencur commented Mar 27, 2024

openshift-ci bot commented Mar 27, 2024

[release-1.32] Bump to 1.32.1 #2575

[release-1.32] Bump to 1.32.1 #2575

Conversation

pierDipi commented Mar 22, 2024 • edited Loading

pierDipi commented Mar 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pierDipi commented Mar 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lberk commented Mar 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matzew left a comment

Choose a reason for hiding this comment

Kaustubh-pande commented Mar 25, 2024

matzew commented Mar 26, 2024

pierDipi commented Mar 26, 2024

ReToCode commented Mar 26, 2024

Choose a reason for hiding this comment

mgencur commented Mar 26, 2024

mgencur commented Mar 26, 2024

pierDipi commented Mar 26, 2024

pierDipi commented Mar 26, 2024

mgencur commented Mar 27, 2024

pierDipi commented Mar 27, 2024

pierDipi commented Mar 27, 2024

pierDipi commented Mar 27, 2024

mgencur commented Mar 27, 2024

openshift-ci bot commented Mar 27, 2024

pierDipi commented Mar 22, 2024 •

edited

Loading