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

MGMT-15047: use installer to deploy on external platform #5381

Conversation

adriengentil
Copy link
Contributor

@adriengentil adriengentil commented Jul 24, 2023

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.

x-ref: openshift/installer#7217

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 24, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 24, 2023

@adriengentil: This pull request references MGMT-15047 which is a valid jira issue.

In response to this:

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.

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-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 24, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jul 24, 2023

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

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

openshift-ci-robot commented Jul 24, 2023

@adriengentil: This pull request references MGMT-15047 which is a valid jira issue.

In response to this:

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.

x-ref: openshift/installer#7217

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2023
@adriengentil
Copy link
Contributor Author

/test lint unit-test

@openshift-ci
Copy link

openshift-ci bot commented Jul 24, 2023

@adriengentil: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-agent-compact-ipv4
  • /test edge-assisted-operator-catalog-publish-verify
  • /test edge-ci-index
  • /test edge-e2e-ai-operator-ztp
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-late-binding
  • /test edge-e2e-metal-assisted
  • /test edge-e2e-metal-assisted-4-10
  • /test edge-e2e-metal-assisted-4-11
  • /test edge-e2e-metal-assisted-4-12
  • /test edge-e2e-metal-assisted-4-9
  • /test edge-e2e-metal-assisted-cnv
  • /test edge-e2e-metal-assisted-lvm
  • /test edge-e2e-metal-assisted-odf
  • /test edge-images
  • /test edge-lint
  • /test edge-subsystem-aws
  • /test edge-subsystem-kubeapi-aws
  • /test edge-unit-test
  • /test edge-verify-generated-code
  • /test images
  • /test mce-images

The following commands are available to trigger optional jobs:

  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv6
  • /test edge-e2e-ai-operator-ztp-3masters
  • /test edge-e2e-ai-operator-ztp-capi
  • /test edge-e2e-ai-operator-ztp-compact-day2-masters
  • /test edge-e2e-ai-operator-ztp-compact-day2-workers
  • /test edge-e2e-ai-operator-ztp-disconnected
  • /test edge-e2e-ai-operator-ztp-hypershift-zero-nodes
  • /test edge-e2e-ai-operator-ztp-multiarch-3masters-ocp-411
  • /test edge-e2e-ai-operator-ztp-multiarch-sno-ocp-411
  • /test edge-e2e-ai-operator-ztp-node-labels
  • /test edge-e2e-ai-operator-ztp-sno-day2-masters
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-ignitionoverride
  • /test edge-e2e-metal-assisted-4-13
  • /test edge-e2e-metal-assisted-4-14
  • /test edge-e2e-metal-assisted-day2
  • /test edge-e2e-metal-assisted-day2-arm-workers
  • /test edge-e2e-metal-assisted-day2-single-node
  • /test edge-e2e-metal-assisted-ipv4v6
  • /test edge-e2e-metal-assisted-ipv6
  • /test edge-e2e-metal-assisted-kube-api-late-binding-single-node
  • /test edge-e2e-metal-assisted-kube-api-late-unbinding-ipv4-single-node
  • /test edge-e2e-metal-assisted-kube-api-net-suite
  • /test edge-e2e-metal-assisted-mce
  • /test edge-e2e-metal-assisted-mce-4-10
  • /test edge-e2e-metal-assisted-mce-sno
  • /test edge-e2e-metal-assisted-metallb
  • /test edge-e2e-metal-assisted-none
  • /test edge-e2e-metal-assisted-onprem
  • /test edge-e2e-metal-assisted-single-node
  • /test edge-e2e-metal-assisted-static-ip-suite
  • /test edge-e2e-metal-assisted-tang
  • /test edge-e2e-metal-assisted-tpmv2
  • /test edge-e2e-metal-assisted-upgrade-agent
  • /test edge-e2e-nutanix-assisted
  • /test edge-e2e-nutanix-assisted-2workers
  • /test edge-e2e-oci-assisted
  • /test edge-e2e-vsphere-assisted
  • /test edge-e2e-vsphere-assisted-4-12
  • /test edge-e2e-vsphere-assisted-4-13
  • /test edge-e2e-vsphere-assisted-umn
  • /test edge-push-pr-image
  • /test push-pr-image

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

  • pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4
  • pull-ci-openshift-assisted-service-master-edge-ci-index
  • pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-ztp
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted
  • pull-ci-openshift-assisted-service-master-edge-images
  • pull-ci-openshift-assisted-service-master-edge-lint
  • pull-ci-openshift-assisted-service-master-edge-subsystem-aws
  • pull-ci-openshift-assisted-service-master-edge-subsystem-kubeapi-aws
  • pull-ci-openshift-assisted-service-master-edge-unit-test
  • pull-ci-openshift-assisted-service-master-edge-verify-generated-code
  • pull-ci-openshift-assisted-service-master-images
  • pull-ci-openshift-assisted-service-master-mce-images

In response to this:

/test lint unit-test

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.

@adriengentil
Copy link
Contributor Author

/test edge-lint edge-unit-test

@codecov
Copy link

codecov bot commented Jul 24, 2023

Codecov Report

Merging #5381 (4a29b3d) into master (6a583ef) will increase coverage by 0.23%.
Report is 8 commits behind head on master.
The diff coverage is 0.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5381      +/-   ##
==========================================
+ Coverage   67.67%   67.91%   +0.23%     
==========================================
  Files         226      226              
  Lines       33349    33862     +513     
==========================================
+ Hits        22570    22996     +426     
- Misses       8745     8819      +74     
- Partials     2034     2047      +13     
Files Changed Coverage Δ
internal/provider/external/ignition.go 0.00% <ø> (-60.00%) ⬇️
internal/provider/external/installConfig.go 0.00% <0.00%> (ø)

... and 8 files with indirect coverage changes

@adriengentil
Copy link
Contributor Author

/test edge-e2e-oci-assisted

@adriengentil
Copy link
Contributor Author

install config:

# cat ./install-config.yaml.test-infra-cluster-9201abcd
apiVersion: v1
baseDomain: assisted-ci.oci-rhelcert.edge-sro.rhecoeng.com
networking:
  networkType: OVNKubernetes
  clusterNetwork:
  - cidr: 172.30.0.0/16
    hostPrefix: 23
  machineNetwork:
  - cidr: 10.0.1.0/24
  serviceNetwork:
  - 10.128.0.0/14
metadata:
  name: test-infra-cluster-9201abcd
compute:
- hyperthreading: Enabled
  name: worker
  replicas: 2
controlPlane:
  hyperthreading: Enabled
  name: master
  replicas: 3
platform:
  external:
    platformName: oci
fips: false
pullSecret: ...

infrastructure object:

# oc get infrastructure/cluster -o yaml
apiVersion: config.openshift.io/v1
kind: Infrastructure
metadata:
  creationTimestamp: "2023-07-26T08:31:24Z"
  generation: 1
  name: cluster
  resourceVersion: "531"
  uid: 8ac3bb3a-1918-4e9f-8fa2-16dd979950a0
spec:
  cloudConfig:
    name: ""
  platformSpec:
    external:
      platformName: oci
    type: External
status:
  apiServerInternalURI: https://api-int.test-infra-cluster-9201abcd.assisted-ci.oci-rhelcert.edge-sro.rhecoeng.com:6443
  apiServerURL: https://api.test-infra-cluster-9201abcd.assisted-ci.oci-rhelcert.edge-sro.rhecoeng.com:6443
  controlPlaneTopology: HighlyAvailable
  etcdDiscoveryDomain: ""
  infrastructureName: test-infra-cluster-92-sbn4k
  infrastructureTopology: HighlyAvailable
  platform: External
  platformStatus:
    external:
      cloudControllerManager:
        state: External
    type: External

nodes are labelled correctly:

# oc get nodes --show-labels
NAME                                   STATUS   ROLES                  AGE   VERSION           LABELS
test-infra-cluster-9201abcd-master-0   Ready    control-plane,master   39m   v1.27.3+4aaeaec   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=VM.Standard3.Flex,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-sanjose-1,failure-domain.beta.kubernetes.io/zone=US-SANJOSE-1-AD-1,kubernetes.io/arch=amd64,kubernetes.io/hostname=test-infra-cluster-9201abcd-master-0,kubernetes.io/os=linux,node-role.kubernetes.io/control-plane=,node-role.kubernetes.io/master=,node.kubernetes.io/instance-type=VM.Standard3.Flex,node.openshift.io/os_id=rhcos,oci.oraclecloud.com/fault-domain=FAULT-DOMAIN-2,topology.kubernetes.io/region=us-sanjose-1,topology.kubernetes.io/zone=US-SANJOSE-1-AD-1
test-infra-cluster-9201abcd-master-1   Ready    control-plane,master   18m   v1.27.3+4aaeaec   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=VM.Standard3.Flex,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-sanjose-1,failure-domain.beta.kubernetes.io/zone=US-SANJOSE-1-AD-1,kubernetes.io/arch=amd64,kubernetes.io/hostname=test-infra-cluster-9201abcd-master-1,kubernetes.io/os=linux,node-role.kubernetes.io/control-plane=,node-role.kubernetes.io/master=,node.kubernetes.io/instance-type=VM.Standard3.Flex,node.openshift.io/os_id=rhcos,oci.oraclecloud.com/fault-domain=FAULT-DOMAIN-2,topology.kubernetes.io/region=us-sanjose-1,topology.kubernetes.io/zone=US-SANJOSE-1-AD-1
test-infra-cluster-9201abcd-master-2   Ready    control-plane,master   39m   v1.27.3+4aaeaec   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=VM.Standard3.Flex,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-sanjose-1,failure-domain.beta.kubernetes.io/zone=US-SANJOSE-1-AD-1,kubernetes.io/arch=amd64,kubernetes.io/hostname=test-infra-cluster-9201abcd-master-2,kubernetes.io/os=linux,node-role.kubernetes.io/control-plane=,node-role.kubernetes.io/master=,node.kubernetes.io/instance-type=VM.Standard3.Flex,node.openshift.io/os_id=rhcos,oci.oraclecloud.com/fault-domain=FAULT-DOMAIN-2,topology.kubernetes.io/region=us-sanjose-1,topology.kubernetes.io/zone=US-SANJOSE-1-AD-1
test-infra-cluster-9201abcd-worker-0   Ready    worker                 23m   v1.27.3+4aaeaec   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=VM.Standard3.Flex,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-sanjose-1,failure-domain.beta.kubernetes.io/zone=US-SANJOSE-1-AD-1,kubernetes.io/arch=amd64,kubernetes.io/hostname=test-infra-cluster-9201abcd-worker-0,kubernetes.io/os=linux,node-role.kubernetes.io/worker=,node.kubernetes.io/instance-type=VM.Standard3.Flex,node.openshift.io/os_id=rhcos,oci.oraclecloud.com/fault-domain=FAULT-DOMAIN-2,topology.kubernetes.io/region=us-sanjose-1,topology.kubernetes.io/zone=US-SANJOSE-1-AD-1
test-infra-cluster-9201abcd-worker-1   Ready    worker                 22m   v1.27.3+4aaeaec   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=VM.Standard3.Flex,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-sanjose-1,failure-domain.beta.kubernetes.io/zone=US-SANJOSE-1-AD-1,kubernetes.io/arch=amd64,kubernetes.io/hostname=test-infra-cluster-9201abcd-worker-1,kubernetes.io/os=linux,node-role.kubernetes.io/worker=,node.kubernetes.io/instance-type=VM.Standard3.Flex,node.openshift.io/os_id=rhcos,oci.oraclecloud.com/fault-domain=FAULT-DOMAIN-2,topology.kubernetes.io/region=us-sanjose-1,topology.kubernetes.io/zone=US-SANJOSE-1-AD-1

@adriengentil
Copy link
Contributor Author

/hold
until 4.14-ec.4 is released in AI

@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 Jul 26, 2023
@adriengentil
Copy link
Contributor Author

/cc @gamli75 @eliorerz

@openshift-ci openshift-ci bot requested review from eliorerz and gamli75 July 26, 2023 09:25
@adriengentil adriengentil marked this pull request as ready for review July 26, 2023 09:25
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 26, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 27, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jul 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adriengentil, gamli75

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 [adriengentil,gamli75]

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

@adriengentil
Copy link
Contributor Author

/unhold
EC4 will contain the required changes and should be published by tomorrow.

@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 Jul 27, 2023
@adriengentil
Copy link
Contributor Author

/cherry-pick cloud_hotfix_releases

@openshift-cherrypick-robot

@adriengentil: once the present PR merges, I will cherry-pick it on top of cloud_hotfix_releases in a new PR and assign it to you.

In response to this:

/cherry-pick cloud_hotfix_releases

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-ci
Copy link

openshift-ci bot commented Jul 27, 2023

@adriengentil: all tests passed!

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.

@openshift-merge-robot openshift-merge-robot merged commit 5018023 into openshift:master Jul 27, 2023
15 checks passed
@openshift-cherrypick-robot

@adriengentil: new pull request created: #5393

In response to this:

/cherry-pick cloud_hotfix_releases

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.

CrystalChun pushed a commit to CrystalChun/assisted-service that referenced this pull request Aug 25, 2023
)

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.
@adriengentil
Copy link
Contributor Author

/cherry-pick release-ocm-2.8

@openshift-cherrypick-robot

@adriengentil: #5381 failed to apply on top of branch "release-ocm-2.8":

Applying: MGMT-15047: use installer to deploy on external platform
Using index info to reconstruct a base tree...
M	internal/provider/external/ignition.go
A	internal/provider/external/ignition_test.go
M	internal/provider/registry/registry_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/provider/registry/registry_test.go
Auto-merging internal/provider/external/ignition.go
CONFLICT (content): Merge conflict in internal/provider/external/ignition.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-15047: use installer to deploy on external platform
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-ocm-2.8

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.

adriengentil added a commit to adriengentil/assisted-service that referenced this pull request Sep 14, 2023
)

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.
openshift-merge-robot pushed a commit that referenced this pull request Sep 14, 2023
…external platform (#5490)

* MGMT-15034: Fix patch of infrastructure CR with external platform (#5312)

Patch directly the Infrastructure CR from PostCreateManifestsHook
function which makes it easier to test.

This part of the code is a workaround until the openshift installer
supports external platform.

* MGMT-15047: use installer to deploy on external platform (#5381)

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.
danielerez pushed a commit to danielerez/assisted-service that referenced this pull request Oct 15, 2023
)

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.
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. 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.

None yet

5 participants