Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ztp: CNF-9748: Add ZAP labelling #1659

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

vitus133
Copy link
Contributor

This commit adds ZTP site-generator capabilities needed for ZAP (ZTP Accelerated Provisioning):

  • allow multiple manifestsConfigMapRefs in ACI, instead of the deprecated manifestsConfigMapRef
  • add second configmap reference to ACI and label the managedCluster when ztp-accelerated-provisioning label
    is added to siteConfig clusterLabels and has one of the two predefined values

/cc @imiller0 @lack

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vitus133

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 19, 2023
@vitus133 vitus133 changed the title ztp: Add ZAP labelling ztp: CNF-9748: Add ZAP labelling Sep 19, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 19, 2023
@openshift-ci-robot
Copy link
Collaborator

@vitus133: This pull request references CNF-9748 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 story to target the "4.15.0" version, but no target version was set.

In response to this:

This commit adds ZTP site-generator capabilities needed for ZAP (ZTP Accelerated Provisioning):

  • allow multiple manifestsConfigMapRefs in ACI, instead of the deprecated manifestsConfigMapRef
  • add second configmap reference to ACI and label the managedCluster when ztp-accelerated-provisioning label
    is added to siteConfig clusterLabels and has one of the two predefined values

/cc @imiller0 @lack

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.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 12, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 15, 2023
@vitus133
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 16, 2023
@vitus133
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 16, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 1, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 2, 2023
@vitus133 vitus133 force-pushed the add-cm-2 branch 2 times, most recently from 1ea0233 to c28f8bc Compare February 15, 2024 06:57
This commit adds ZTP site-generator capabilities needed for ZAP
(ZTP Accelerated Provisioning):
- allow multiple manifestsConfigMapRefs in ACI, instead of deprecated
manifestsConfigMapRef
- add second configmap reference to ACI and label managedCluster
when ztp-accelerated-provisioning is added to siteConfig clusterLabels

Signed-off-by: Vitaly Grinberg <v.g@redhat.com>
Copy link
Contributor

openshift-ci bot commented Feb 15, 2024

@vitus133: 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/e2e-aws-ci-tests bd0971f link true /test e2e-aws-ci-tests

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/test-infra repository. I understand the commands that are listed here.

@vitus133
Copy link
Contributor Author

/retest

@sabbir-47
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@sabbir-47
Copy link
Contributor

@vitus133 : Just a quick note, when this feature will work end-to-end(PR from TALM gets merged), please update the upstream documentation in a separate PR.

@openshift-merge-bot openshift-merge-bot bot merged commit ef4e4d9 into openshift-kni:master Feb 15, 2024
6 checks passed
@vitus133 vitus133 deleted the add-cm-2 branch February 15, 2024 13:43
zeeke added a commit to zeeke/cnf-features-deploy that referenced this pull request Feb 19, 2024
refs:
- openshift-kni#1659

Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants