SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) #2827

pierDipi · 2024-09-02T15:57:25Z

No description provided.

openshift-ci · 2024-09-02T15:57:30Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

pierDipi · 2024-09-02T15:57:47Z

hack/lib/images.bash

+function latest_konflux_image_sha() {
+  input=${1:?"Provide image"}
+
+  image_without_tag=${input%:*} # Remove tag, if any
+  image_without_tag=${image_without_tag%@*} # Remove sha, if any
+
+  # TODO uncomment, exit with error
+  # digest=$(docker manifest inspect "${image_without_tag}:latest" -v | jq '.Descriptor.digest')
+  digest=''
+  if [ "${digest}" = "" ]; then
+    # exit 1
+    echo "${image_without_tag}:latest"
+    return
+  fi
+
+  echo "${image_without_tag}@${digest}"
+}


Fix TODO once we are on 1.35 and we have serving, eventing, and SO built with Konflux

pierDipi · 2024-09-02T16:48:13Z

hack/lib/catalogsource.bash

    if ! grep "${bundle}" "${rootdir}/${index_dorkerfile_path}"; then
      logger.error "Bundle ${bundle} not found in Dockerfile."
      return 1
    fi
-    sed -i "s_\(.*\)\(${bundle}\)\(.*\)_\1image-registry.openshift-image-registry.svc:5000/$OLM_NAMESPACE/serverless-bundle:latest\3_" "${rootdir}/${index_dorkerfile_path}"
+    sed -ri "s#(.*)(${bundle})(:[a-z0-9]*)?(@sha[0-9]+:[a-z0-9]+)?(.*)#\1image-registry.openshift-image-registry.svc:5000/${OLM_NAMESPACE}/serverless-bundle:latest\5#" "${rootdir}/${index_dorkerfile_path}"


Tested with:

$ bundle="quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-release-134/serverless-bundle" $ sed -r "s#(.*)(${bundle})(:[a-z0-9]*)?(@sha[0-9]+:[a-z0-9]+)?(.*)#\1image-registry.openshift-image-registry.svc:5000/<namespace>/serverless-bundle:latest\5#" olm-catalog/serverless-operator/index/Dockerfile FROM registry.ci.openshift.org/origin/4.15:operator-registry AS opm FROM registry.access.redhat.com/ubi9/ubi-minimal as builder COPY --from=opm /bin/opm /bin/opm 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 \ quay.io/openshift-knative/serverless-bundle:release-1.32.0 \ registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle >> /configs/index.yaml || \ /bin/opm render --skip-tls-verify -o yaml \ quay.io/openshift-knative/serverless-bundle:release-1.32.0 \ registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \ image-registry.openshift-image-registry.svc:5000/<namespace>/serverless-bundle:latest >> /configs/index.yaml FROM registry.ci.openshift.org/origin/4.15:operator-registry COPY --from=builder /configs /configs LABEL operators.operatorframework.io.index.configs.v1=/configs ENTRYPOINT ["/bin/opm"] CMD ["serve", "/configs"]

The idea is for matching:

(.*) match starting spaces and anything else until the next match

(${bundle}) match the bundle image without tag or sha

(:[a-z0-9]*)? optionally match tag

(@sha[0-9]+:[a-z0-9]+)? optionally match sha

(.*) match the rest

Replace:

\1 Use everything matched by 1

image-registry.openshift-image-registry.svc:5000/${OLM_NAMESPACE}/serverless-bundle:latest replace the image

\5 use everything matched by 5

hack/lib/images.bash

Signed-off-by: Pierangelo Di Pilato <[email protected]>

@sha

Tested with: ``` $ bundle="quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-release-134/serverless-bundle" $ sed -r "s#(.*)(${bundle})(:[a-z0-9]*)?(@sha[0-9]+:[a-z0-9]+)?(.*)#\1image-registry.openshift-image-registry.svc:5000/<namespace>/serverless-bundle:latest\5#" olm-catalog/serverless-operator/index/Dockerfile FROM registry.ci.openshift.org/origin/4.15:operator-registry AS opm FROM registry.access.redhat.com/ubi9/ubi-minimal as builder COPY --from=opm /bin/opm /bin/opm 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 \ quay.io/openshift-knative/serverless-bundle:release-1.32.0 \ registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle >> /configs/index.yaml || \ /bin/opm render --skip-tls-verify -o yaml \ quay.io/openshift-knative/serverless-bundle:release-1.32.0 \ registry.ci.openshift.org/knative/release-1.33.0:serverless-bundle \ image-registry.openshift-image-registry.svc:5000/<namespace>/serverless-bundle:latest >> /configs/index.yaml FROM registry.ci.openshift.org/origin/4.15:operator-registry COPY --from=builder /configs /configs LABEL operators.operatorframework.io.index.configs.v1=/configs ENTRYPOINT ["/bin/opm"] CMD ["serve", "/configs"] ``` Signed-off-by: Pierangelo Di Pilato <[email protected]>

Signed-off-by: Pierangelo Di Pilato <[email protected]>

pierDipi · 2024-09-25T10:36:16Z

/test 416-operator-e2e-aws-416
/test 416-images

Signed-off-by: Pierangelo Di Pilato <[email protected]>

pierDipi · 2024-09-25T10:37:32Z

/test 416-operator-e2e-aws-416
/test 416-images

pierDipi · 2024-09-25T16:22:39Z

/test 416-operator-e2e-aws-416
/test 416-images

skopeo because, Podman doesn't work, Docker needs DinD in CI. Signed-off-by: Pierangelo Di Pilato <[email protected]>

openshift-ci-robot · 2024-09-30T10:59:09Z

@pierDipi: This pull request references SRVCOM-3319 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

pierDipi · 2024-09-30T13:20:12Z

/test 416-upstream-e2e-kafka-aws-416

pierDipi · 2024-10-01T10:23:31Z

/test 416-test-upgrade-aws-416

creydr

$ k -n knative-eventing get po eventing-controller-5dcb8787-4d4jb -ojsonpath='{.spec.containers[*].image}'
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-controller@sha256:221b032b42a451896b2f73530b327934c8d662a67a6ea3b1e1e8bcfecd1a666f registry.ci.openshift.org/origin/4.15:kube-rbac-proxy

/lgtm

creydr · 2024-10-01T09:03:04Z

hack/lib/images.bash

+  export GOPATH="$PATH:$go_bin"
+  digest=$(skopeo inspect "docker://${image_without_tag}:latest" | jq -r '.Digest')
+  if [ "${digest}" = "" ]; then
+    exit 1


nit: print the reason for the exit (can be done as a follow up)

openshift-ci · 2024-10-01T10:59:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: creydr, 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~~ [creydr,pierDipi]

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

openshift-ci-robot · 2024-10-01T13:23:13Z

/retest-required

Remaining retests: 0 against base HEAD 7e578e6 and 2 for PR HEAD db10a4b in total

openshift-ci-robot · 2024-10-01T16:34:01Z

/retest-required

Remaining retests: 0 against base HEAD 7e578e6 and 2 for PR HEAD db10a4b in total

openshift-ci-robot · 2024-10-01T19:38:05Z

/retest-required

Remaining retests: 0 against base HEAD ad83047 and 2 for PR HEAD db10a4b in total

openshift-ci-robot · 2024-10-01T23:03:59Z

/retest-required

Remaining retests: 0 against base HEAD ad83047 and 2 for PR HEAD db10a4b in total

openshift-ci-robot · 2024-10-02T02:44:33Z

/retest-required

Remaining retests: 0 against base HEAD ad83047 and 2 for PR HEAD db10a4b in total

openshift-ci · 2024-10-02T05:17:40Z

@pierDipi: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/416-test-upgrade-aws-416	`db10a4b`	link	true	`/test 416-test-upgrade-aws-416`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2024-10-02T05:24:21Z

/retest-required

Remaining retests: 0 against base HEAD ad83047 and 2 for PR HEAD db10a4b in total

pierDipi · 2024-10-02T06:18:38Z

FAIL test/upgrade.TestServerlessUpgradePrePost/Run/Steps/PostUpgradeTests/Verify_jobs_in_knative-serving (-1.00s)

=== Failed
=== FAIL: test/upgrade  (0.00s)
panic: test timed out after 1h30m0s
running tests:
	TestServerlessUpgradePrePost (1h30m0s)
	TestServerlessUpgradePrePost/Run/Steps (1h27m38s)
	TestServerlessUpgradePrePost/Run/Steps/PostUpgradeTests (1h26m38s)
	TestServerlessUpgradePrePost/Run/Steps/PostUpgradeTests/Verify_jobs_in_knative-serving (1h26m38s)

goroutine 2732 [running]:
testing.(*M).startAlarm.func1()
	/usr/lib/golang/src/testing/testing.go:2366 +0x265
created by time.goFunc
	/usr/lib/golang/src/time/sleep.go:177 +0x45

pierDipi · 2024-10-02T06:18:49Z

It doesn't seem related

openshift-ci bot added the do-not-merge/work-in-progress label Sep 2, 2024

openshift-ci bot added the approved label Sep 2, 2024

pierDipi commented Sep 2, 2024

View reviewed changes

pierDipi changed the title ~~Generate CSV with Konflux images (serving and eventing)~~ Generate CSV with Konflux images (serving, eventing, operator) Sep 2, 2024

pierDipi commented Sep 2, 2024

View reviewed changes

pierDipi changed the title ~~Generate CSV with Konflux images (serving, eventing, operator)~~ [WIP] Generate CSV with Konflux images (serving, eventing, operator) Sep 2, 2024

pierDipi force-pushed the konflux-csv branch from 752f0f2 to 38c6293 Compare September 2, 2024 17:06

pierDipi commented Sep 4, 2024

View reviewed changes

hack/lib/images.bash Outdated Show resolved Hide resolved

pierDipi force-pushed the konflux-csv branch from 38c6293 to 02623e7 Compare September 12, 2024 10:00

openshift-merge-robot added the needs-rebase label Sep 13, 2024

pierDipi added 3 commits September 16, 2024 10:18

Generate CSV with Konflux images (serving and eventing)

cb9df0e

Signed-off-by: Pierangelo Di Pilato <[email protected]>

Respect per component configurations

bd3e646

Signed-off-by: Pierangelo Di Pilato <[email protected]>

pierDipi force-pushed the konflux-csv branch from 02623e7 to bd3e646 Compare September 16, 2024 08:20

openshift-merge-robot removed the needs-rebase label Sep 16, 2024

knative -> kn

5ac98be

Signed-off-by: Pierangelo Di Pilato <[email protected]>

openshift-merge-robot added the needs-rebase label Sep 24, 2024

pierDipi added 2 commits September 25, 2024 09:41

Merge branch 'main' into konflux-csv

e29e1cc

Use SHAs for image references

ccb763f

Signed-off-by: Pierangelo Di Pilato <[email protected]>

openshift-merge-robot removed the needs-rebase label Sep 25, 2024

Merge branch 'main' into konflux-csv

c52aab1

Signed-off-by: Pierangelo Di Pilato <[email protected]>

pierDipi force-pushed the konflux-csv branch from 1b31329 to c52aab1 Compare September 25, 2024 10:37

pierDipi mentioned this pull request Sep 26, 2024

Install Skopeo to get latest Konflux image SHAs openshift-knative/hack#303

Merged

pierDipi added 2 commits September 26, 2024 09:20

Install sobranch and use skopeo

aebcef4

skopeo because, Podman doesn't work, Docker needs DinD in CI. Signed-off-by: Pierangelo Di Pilato <[email protected]>

Merge branch 'main' into konflux-csv

56739e3

pierDipi force-pushed the konflux-csv branch from ba3bacf to 56739e3 Compare September 26, 2024 07:22

pierDipi force-pushed the konflux-csv branch from 341e9ef to db10a4b Compare September 30, 2024 10:08

pierDipi changed the title ~~[WIP] Generate CSV with Konflux images (serving, eventing, operator)~~ Generate CSV with Konflux images (serving, eventing, operator) Sep 30, 2024

pierDipi changed the title ~~Generate CSV with Konflux images (serving, eventing, operator)~~ SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) Sep 30, 2024

openshift-ci-robot added the jira/valid-reference label Sep 30, 2024

pierDipi marked this pull request as ready for review September 30, 2024 11:40

openshift-ci bot removed the do-not-merge/work-in-progress label Sep 30, 2024

pierDipi requested review from mgencur and skonto September 30, 2024 11:40

openshift-ci bot requested review from creydr and dsimansk September 30, 2024 11:40

pierDipi requested a review from ReToCode September 30, 2024 11:40

creydr reviewed Oct 1, 2024

View reviewed changes

openshift-ci bot assigned creydr Oct 1, 2024

openshift-ci bot added the lgtm label Oct 1, 2024

pierDipi merged commit a28da85 into openshift-knative:main Oct 2, 2024
14 of 16 checks passed

pierDipi deleted the konflux-csv branch October 2, 2024 06:20

mgencur mentioned this pull request Oct 3, 2024

Define project.tag in project.yaml #2897

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) #2827

SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) #2827

pierDipi commented Sep 2, 2024

openshift-ci bot commented Sep 2, 2024

pierDipi Sep 2, 2024 •

edited

Loading

pierDipi Sep 2, 2024

pierDipi Sep 2, 2024

pierDipi Sep 2, 2024

pierDipi commented Sep 25, 2024

pierDipi commented Sep 25, 2024

pierDipi commented Sep 25, 2024

openshift-ci-robot commented Sep 30, 2024

pierDipi commented Sep 30, 2024

pierDipi commented Oct 1, 2024

creydr left a comment

creydr Oct 1, 2024

openshift-ci bot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 2, 2024

openshift-ci bot commented Oct 2, 2024

openshift-ci-robot commented Oct 2, 2024

pierDipi commented Oct 2, 2024

pierDipi commented Oct 2, 2024

SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) #2827

SRVCOM-3319: Generate CSV with Konflux images (serving, eventing, operator) #2827

Conversation

pierDipi commented Sep 2, 2024

openshift-ci bot commented Sep 2, 2024

pierDipi Sep 2, 2024 • edited Loading

Choose a reason for hiding this comment

pierDipi Sep 2, 2024

Choose a reason for hiding this comment

pierDipi Sep 2, 2024

Choose a reason for hiding this comment

pierDipi Sep 2, 2024

Choose a reason for hiding this comment

pierDipi commented Sep 25, 2024

pierDipi commented Sep 25, 2024

pierDipi commented Sep 25, 2024

openshift-ci-robot commented Sep 30, 2024

pierDipi commented Sep 30, 2024

pierDipi commented Oct 1, 2024

creydr left a comment

Choose a reason for hiding this comment

creydr Oct 1, 2024

Choose a reason for hiding this comment

openshift-ci bot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 1, 2024

openshift-ci-robot commented Oct 2, 2024

openshift-ci bot commented Oct 2, 2024

openshift-ci-robot commented Oct 2, 2024

pierDipi commented Oct 2, 2024

pierDipi commented Oct 2, 2024

pierDipi Sep 2, 2024 •

edited

Loading