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

HOSTEDCP-1981: Add controlplane cli image envar for use with hypershift #2507

Merged

Conversation

Patryk-Stefanski
Copy link
Contributor

@Patryk-Stefanski Patryk-Stefanski commented Sep 19, 2024

Add CLI_CONTROL_PLANE_IMAGE enavr to
cloud-network, multus-admission-controller and node-identity to avoid
registryOverrides propagating to data plane components

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 19, 2024

@Patryk-Stefanski: This pull request references HOSTEDCP-1981 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:

… hypershift

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.

@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, 2024
@openshift-ci openshift-ci bot requested review from dougbtv and trozet September 19, 2024 15:21
Copy link
Contributor

openshift-ci bot commented Sep 20, 2024

@Patryk-Stefanski: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test 4.18-upgrade-from-stable-4.17-images
  • /test e2e-aws-ovn-hypershift-conformance
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-windows
  • /test e2e-azure-ovn-upgrade
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upgrade
  • /test e2e-metal-ipi-ovn-ipv6
  • /test images
  • /test lint
  • /test unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test 4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
  • /test 4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
  • /test 4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade
  • /test e2e-aws-hypershift-ovn-kubevirt
  • /test e2e-aws-ovn-ipsec-serial
  • /test e2e-aws-ovn-ipsec-upgrade
  • /test e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • /test e2e-aws-ovn-serial
  • /test e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-techpreview-serial
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-dualstack
  • /test e2e-azure-ovn-manual-oidc
  • /test e2e-gcp-ovn-techpreview
  • /test e2e-metal-ipi-ovn-ipv6-ipsec
  • /test e2e-network-mtu-migration-ovn-ipv4
  • /test e2e-network-mtu-migration-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-ovn-hybrid-step-registry
  • /test e2e-ovn-ipsec-step-registry
  • /test e2e-ovn-step-registry
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-ovn-dualstack
  • /test e2e-vsphere-ovn-dualstack-primaryv6
  • /test e2e-vsphere-ovn-windows
  • /test okd-scos-images
  • /test qe-perfscale-aws-ovn-medium-cluster-density
  • /test qe-perfscale-aws-ovn-medium-node-density-cni
  • /test qe-perfscale-aws-ovn-small-cluster-density
  • /test qe-perfscale-aws-ovn-small-node-density-cni
  • /test security

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.18-upgrade-from-stable-4.17-images
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-hypershift-ovn-kubevirt
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-hypershift-conformance
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-single-node
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-windows
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6-ipsec
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv4
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-openstack-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-hybrid-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-ipsec-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn-dualstack
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn-dualstack-primaryv6
  • pull-ci-openshift-cluster-network-operator-master-images
  • pull-ci-openshift-cluster-network-operator-master-lint
  • pull-ci-openshift-cluster-network-operator-master-security
  • pull-ci-openshift-cluster-network-operator-master-unit
  • pull-ci-openshift-cluster-network-operator-master-verify

In response to this:

/retest required

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.

@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

3 similar comments
@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 24, 2024

@Patryk-Stefanski: This pull request references HOSTEDCP-1981 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:

Add data plane cli image envar to iptables for use with hyper shift. We need the ability to distinguish between data plane and control plane images

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.

@Patryk-Stefanski
Copy link
Contributor Author

@dougbtv could you ptal.

@kyrtapz
Copy link
Contributor

kyrtapz commented Sep 26, 2024

Can we do it the other way around to keep it consistent with the already existing OVN-K image approach?
In HyperShift controlplane we would read CLI_CONTROL_PLANE_IMAGE and we would use the CLI_IMAGE in all other cases.
Note that the iptables alerter was introduced in 4.16 so less backports! :)

@Patryk-Stefanski Patryk-Stefanski changed the title HOSTEDCP-1981: Add dataplane cli image envar to iptables for use with… HOSTEDCP-1981: Add dataplane cli image envar to iptables for use HCP Sep 26, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 26, 2024

@Patryk-Stefanski: This pull request references HOSTEDCP-1981 which is a valid jira issue.

In response to this:

Add CLI_CONTROL_PLANE_IMAGE enavr to
cloud-network, multus-admission-controller and node-identity to avoid
registryOverrides propagating to data plane components

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.

@Patryk-Stefanski
Copy link
Contributor Author

@kyrtapz done

@Patryk-Stefanski Patryk-Stefanski changed the title HOSTEDCP-1981: Add dataplane cli image envar to iptables for use HCP HOSTEDCP-1981: Add controlplane cli image envar for use with hypershift Sep 26, 2024
Add CLI_CONTROL_PLANE_IMAGE enavr to
cloud-network, multus-admission-controller and node-identity to avoid
registryOverrides propagating to data plane components
@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

Copy link
Contributor

openshift-ci bot commented Sep 27, 2024

@Patryk-Stefanski: The following tests 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/security 9a56d23 link false /test security
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 9a56d23 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade 9a56d23 link false /test 4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
ci/prow/e2e-aws-hypershift-ovn-kubevirt 9a56d23 link false /test e2e-aws-hypershift-ovn-kubevirt
ci/prow/e2e-aws-ovn-single-node 9a56d23 link false /test e2e-aws-ovn-single-node
ci/prow/e2e-ovn-ipsec-step-registry 9a56d23 link false /test e2e-ovn-ipsec-step-registry

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.

@kyrtapz
Copy link
Contributor

kyrtapz commented Sep 30, 2024

/lgtm

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

openshift-ci bot commented Sep 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kyrtapz, Patryk-Stefanski

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 30, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1773dcf into openshift:master Sep 30, 2024
27 of 33 checks passed
@kyrtapz
Copy link
Contributor

kyrtapz commented Sep 30, 2024

@Patryk-Stefanski once the HyperShift PR merges it might be a good idea to remove the if condition for this change to ensure we never end up using the wrong image unknowingly.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-network-operator
This PR has been included in build cluster-network-operator-container-v4.18.0-202409301013.p0.g1773dcf.assembly.stream.el9.
All builds following this will include this PR.

@Patryk-Stefanski
Copy link
Contributor Author

/cherry-pick release-4.17 release-4.16 release-4.15 release-4.14

@openshift-cherrypick-robot

@Patryk-Stefanski: new pull request created: #2542

In response to this:

/cherry-pick release-4.17 release-4.16 release-4.15 release-4.14

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.

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.

5 participants