Skip to content

Conversation

@LalatenduMohanty
Copy link
Member

Signed-off-by: Lalatendu Mohanty [email protected]

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 11, 2020
@wking
Copy link
Member

wking commented May 11, 2020

Cross-linking the previous (abandoned?) attempts in #16894 and #17896.

@LalatenduMohanty LalatenduMohanty force-pushed the OTA-102 branch 3 times, most recently from f34c3e0 to 812f370 Compare May 12, 2020 17:59
@smarterclayton
Copy link
Contributor

This doesn't include what I expected to see from #17896 which is the terminology and flow changes (especially the removal of the atrocious registry creation). Is that a follow up I'm missing?

17896 is what the flow should be and captures the flow and terminology that we want to use with customers (I haven't heard a concrete counter). If that's not included here it needs to be a follow up.

Our current flow is not correct.

@wking
Copy link
Member

wking commented May 13, 2020

This doesn't include what I expected to see from #17896...

If that PR gets picked back up and lands, or is carried and lands, I think we'd be happy to rebase on top. But are there any corners we can cut to get something landed around manual ConfigMap creation without having to resolve all the outstanding issues in one big PR?

@smarterclayton
Copy link
Contributor

I was expecting you guys to pick that up and drive it to completion - that was what I thought the last communication on it was.

@LalatenduMohanty LalatenduMohanty force-pushed the OTA-102 branch 2 times, most recently from 3f07318 to 517644f Compare May 29, 2020 11:42
@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jul 1, 2020
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 1, 2020
Copy link

@jianlinliu jianlinliu Jul 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kalexand-rh Command line in the following step 5 missed ${ARCHITECTURE}.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks!

@kalexand-rh
Copy link
Contributor

@jianlinliu, I know this change is valid for 4.5. Which earlier versions can I backport this change to?

@LalatenduMohanty
Copy link
Member Author

@jianlinliu, I know this change is valid for 4.5. Which earlier versions can I backport this change to?

We should backport to 4.4. As this feature is available from 4.4.8.

@jianlinliu
Copy link

LGTM

@kalexand-rh kalexand-rh merged commit 77a7a46 into openshift:master Jul 2, 2020
@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-4.4

@openshift-cherrypick-robot

@kalexand-rh: #21993 failed to apply on top of branch "enterprise-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/installation-adding-registry-pull-secret.adoc
M	modules/installation-mirror-repository.adoc
Falling back to patching base and 3-way merge...
Removing updating/updating-disconnected-cluster.adoc
Auto-merging modules/installation-mirror-repository.adoc
Auto-merging modules/installation-adding-registry-pull-secret.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 Adding documentation for updating a disconnected cluster

Details

In response to this:

/cherrypick enterprise-4.4

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.

@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@kalexand-rh: new pull request created: #23429

Details

In response to this:

/cherrypick enterprise-4.5

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.

@kalexand-rh
Copy link
Contributor

Per https://bugzilla.redhat.com/show_bug.cgi?id=1828214#c14 and an ongoing discussion on Slack, this change also needs to be ported to 4.3.

@kalexand-rh
Copy link
Contributor

@jianlinliu, do you have any objection to applying this change to 4.3? @LalatenduMohanty says fix is in 4.3.12.

@jianlinliu
Copy link

This is a big PR. Some pieces of process does not work in 4.3. Such as: oc mirror payload to disk scenario. But 4.3.13 indeed support user manually create signature configmap, then apply it to existing clusters, then trigger disconnected cluster upgrade.

@LalatenduMohanty
Copy link
Member Author

LalatenduMohanty commented Aug 10, 2020

@kalexand-rh For versions in 4.3.z (i.e. after 4.3.12) will not get the the ConfigMap created by the oc adm release mirror command. So they can not apply the ConfigMap directly i.e. oc apply -f <image_signature_file> [1] post the oc adm release mirror command. User need to create the ConfigMap manually using the steps given in the document [2] and then apply it.

[1] https://docs.openshift.com/container-platform/4.5/updating/updating-restricted-network-cluster.html#update-oc-configmap-signature-verification_updating-restricted-network-cluster
[2] https://docs.openshift.com/container-platform/4.5/updating/updating-restricted-network-cluster.html#update-configuring-image-signature

wking added a commit to wking/openshift-docs that referenced this pull request Oct 8, 2020
Fix:

  asciidoctor: WARNING: includes/update-configuring-image-signature.adoc: line 34: no callout found for <1>

from 8a31e17 (Adding documentation for updating a disconnected
cluster, 2020-05-08, openshift#21993).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.4 branch/enterprise-4.5 size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.