Support for disconnected environments for resolverTasks #2174

Aneesh-M-Bhat · 2024-05-27T15:56:42Z

Changes

This PR adds various images that are used by the ecosystem tasks to be accessible for mirroring for running in disconnected environments, along with few other minor changes.

removed buildpacks & opc
added oc image to the update-image-sha script & ran the script
updated image-substitutions in config.yaml to include all of the ecosystem images
updated filterAndTransform function for resolverTasks to enable the images to be changed

JIRA Issue: https://issues.redhat.com/browse/SRVKP-4591

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

Run make test lint before submitting a PR
Includes tests (if functionality changed/added)
Includes docs (if user facing)
Commit messages follow commit message best practices

See the contribution guide for more details.

Release Notes

Added support for using tasks supported by resolverTasks in tektonconfig to be used in disconnected environments as well.

tekton-robot · 2024-05-27T15:56:51Z

Hi @Aneesh-M-Bhat. Thanks for your PR.

I'm waiting for a tektoncd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

savitaashture · 2024-05-27T15:57:44Z

/ok-to-test

savitaashture · 2024-05-27T16:13:32Z

@Aneesh-M-Bhat I don't see

IMAGE_ADDONS_GIT_RUN for task-git-cli and task-git-clone

piyush-garg · 2024-05-28T06:16:22Z

hack/openshift/update-image-sha.sh

@@ -51,6 +51,7 @@ declare -A IMAGES=(
  ["s2i"]="registry.redhat.io/source-to-image/source-to-image-rhel8"
  ["ubi-minimal"]="registry.redhat.io/ubi8/ubi-minimal"
  ["java"]="registry.redhat.io/ubi8/openjdk-17"
+  ["oc"]="registry.redhat.io/openshift4/ose-cli"


should we use the internal image that we get in image registry of cluster for this like the oc clustertask

do you mean like this image in the oc clustertask?
image: image-registry.openshift-image-registry.svc:5000/openshift/cli:$(params.VERSION)

we can use internal image registry image image-registry.openshift-image-registry.svc:5000/openshift/cli:latest

piyush-garg

Hope all the envs are properly verified

piyush-garg · 2024-05-28T06:19:53Z

operatorhub/openshift/config.yaml

@@ -62,6 +62,9 @@ image-substitutions:
      envKeys:
      - IMAGE_PIPELINES_ARG__GIT_IMAGE
      - IMAGE_ADDONS_PARAM_GITINITIMAGE
+      - IMAGE_ADDONS_GIT_RUN
+      - IMAGE_ADDONS_PREPARE


why git-init for prepare and report steps?

yep prepare we dont need it, but for report step we do, because we use the git command to fetch the latest commit, so it needs it.

piyush-garg · 2024-05-28T06:29:09Z

hack/openshift/update-image-sha.sh

@@ -51,6 +51,7 @@ declare -A IMAGES=(
  ["s2i"]="registry.redhat.io/source-to-image/source-to-image-rhel8"
  ["ubi-minimal"]="registry.redhat.io/ubi8/ubi-minimal"
  ["java"]="registry.redhat.io/ubi8/openjdk-17"
+  ["oc"]="registry.redhat.io/openshift4/ose-cli"


we can use internal image registry image image-registry.openshift-image-registry.svc:5000/openshift/cli:latest

savitaashture · 2024-05-31T11:46:53Z

LGTM

@piyush-garg PTAL @Aneesh-M-Bhat has addressed all the comments

piyush-garg · 2024-05-31T12:52:48Z

/lgtm

pkg/reconciler/common/transformers.go

tekton-robot · 2024-06-04T11:09:23Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jkandasa

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~~ [jkandasa]

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

jkandasa · 2024-06-11T11:18:54Z

/cherry-pick release-v0.71.x

tekton-robot · 2024-06-11T11:20:57Z

@jkandasa: #2174 failed to apply on top of branch "release-v0.71.x":

Applying: Support for disconnected environments
Using index info to reconstruct a base tree...
M	config/openshift/base/operator.yaml
M	operatorhub/openshift/config.yaml
M	operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml
M	pkg/reconciler/common/transformers.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/reconciler/common/transformers.go
Auto-merging operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in operatorhub/openshift/release-artifacts/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml
Auto-merging operatorhub/openshift/config.yaml
CONFLICT (content): Merge conflict in operatorhub/openshift/config.yaml
Auto-merging config/openshift/base/operator.yaml
CONFLICT (content): Merge conflict in config/openshift/base/operator.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support for disconnected environments
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.71.x

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/test-infra repository.

tekton-robot requested review from piyush-garg and PuneetPunamiya May 27, 2024 15:56

tekton-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 27, 2024

tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 27, 2024

tekton-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 27, 2024

piyush-garg reviewed May 28, 2024

View reviewed changes

Aneesh-M-Bhat force-pushed the resolver-minor-changes branch from fa1bd49 to a8007d6 Compare May 28, 2024 06:19

piyush-garg reviewed May 28, 2024

View reviewed changes

Support for disconnected environments

4aea51f

Aneesh-M-Bhat force-pushed the resolver-minor-changes branch from a8007d6 to 4aea51f Compare May 29, 2024 06:55

Aneesh-M-Bhat requested a review from piyush-garg May 31, 2024 06:14

tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 31, 2024

tekton-robot assigned piyush-garg May 31, 2024

tekton-robot added the lgtm Indicates that a PR is ready to be merged. label May 31, 2024

jkandasa reviewed Jun 3, 2024

View reviewed changes

pkg/reconciler/common/transformers.go Show resolved Hide resolved

jkandasa approved these changes Jun 4, 2024

View reviewed changes

tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2024

tekton-robot merged commit 22bb15e into tektoncd:main Jun 4, 2024
8 checks passed

jkandasa added the kind/bug Categorizes issue or PR as related to a bug. label Jun 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for disconnected environments for resolverTasks #2174

Support for disconnected environments for resolverTasks #2174

Aneesh-M-Bhat commented May 27, 2024 •

edited

Loading

tekton-robot commented May 27, 2024

savitaashture commented May 27, 2024

savitaashture commented May 27, 2024

piyush-garg May 28, 2024

Aneesh-M-Bhat May 28, 2024

piyush-garg May 28, 2024

piyush-garg left a comment

piyush-garg May 28, 2024

Aneesh-M-Bhat May 29, 2024

piyush-garg May 28, 2024

savitaashture commented May 31, 2024

piyush-garg commented May 31, 2024

tekton-robot commented Jun 4, 2024

jkandasa commented Jun 11, 2024

tekton-robot commented Jun 11, 2024

Support for disconnected environments for resolverTasks #2174

Support for disconnected environments for resolverTasks #2174

Conversation

Aneesh-M-Bhat commented May 27, 2024 • edited Loading

Changes

Submitter Checklist

Release Notes

tekton-robot commented May 27, 2024

savitaashture commented May 27, 2024

savitaashture commented May 27, 2024

piyush-garg May 28, 2024

Choose a reason for hiding this comment

Aneesh-M-Bhat May 28, 2024

Choose a reason for hiding this comment

piyush-garg May 28, 2024

Choose a reason for hiding this comment

piyush-garg left a comment

Choose a reason for hiding this comment

piyush-garg May 28, 2024

Choose a reason for hiding this comment

Aneesh-M-Bhat May 29, 2024

Choose a reason for hiding this comment

piyush-garg May 28, 2024

Choose a reason for hiding this comment

savitaashture commented May 31, 2024

piyush-garg commented May 31, 2024

tekton-robot commented Jun 4, 2024

jkandasa commented Jun 11, 2024

tekton-robot commented Jun 11, 2024

Aneesh-M-Bhat commented May 27, 2024 •

edited

Loading