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

[Provider/Client] deploy Hosted OCP Cluster #9111

Merged
merged 177 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from 176 commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
ee162ff
WIP Load Balancer
DanielOsypenko Jan 4, 2024
f9a3431
WIP Load Balancer 1
DanielOsypenko Jan 5, 2024
3a8f7aa
hcp setup
DanielOsypenko Jan 15, 2024
48a9e5a
network policy
DanielOsypenko Jan 16, 2024
f5a623c
metallb and reserve-delete host TESTED
DanielOsypenko Jan 22, 2024
7d86caa
hypershift-create-cluster
DanielOsypenko Jan 25, 2024
f651038
hypershift operations
DanielOsypenko Feb 1, 2024
08cddbc
add todo
DanielOsypenko Feb 1, 2024
e179f13
hosted_clsuter module added
DanielOsypenko Feb 6, 2024
939b415
libtest added, check functions added for multiple hosted clusters cre…
DanielOsypenko Feb 18, 2024
435d6e2
add permissions to hcp file
DanielOsypenko Feb 18, 2024
1390299
libtest mark added
DanielOsypenko Feb 18, 2024
84cf7f6
add skip cnv depl if exists
DanielOsypenko Feb 18, 2024
deab0ec
customize lib test
DanielOsypenko Feb 18, 2024
1f1fb90
podman login removed
DanielOsypenko Feb 19, 2024
1c932c3
hcp-binary download issues
DanielOsypenko Feb 19, 2024
8a61961
hcp download fix 1.0
DanielOsypenko Feb 19, 2024
76113cf
dynamic wait for pull image. try
DanielOsypenko Feb 19, 2024
65c2139
dynamic wait for pull image. another try
DanielOsypenko Feb 19, 2024
c86ea8f
removed dynamic wait for hcp pull
DanielOsypenko Feb 19, 2024
c5cab84
fix func to cp file from container
DanielOsypenko Feb 19, 2024
35ecf88
icsp fix 1
DanielOsypenko Feb 19, 2024
d752b3e
minor fixes 1
DanielOsypenko Feb 19, 2024
967f051
minor fix 2
DanielOsypenko Feb 19, 2024
4aa14ab
minor fix 3
DanielOsypenko Feb 19, 2024
f4a2861
minor fix 4
DanielOsypenko Feb 19, 2024
03c0265
iscp parser
DanielOsypenko Feb 19, 2024
5e8579d
iscp fix 10
DanielOsypenko Feb 20, 2024
5e9072b
iscp fix 11
DanielOsypenko Feb 20, 2024
1f04650
icsp fix 12
DanielOsypenko Feb 20, 2024
8252407
icsp fix 13
DanielOsypenko Feb 20, 2024
8d4e6d3
fix wait hcp cluster 1
DanielOsypenko Feb 20, 2024
2351218
added test_provider_deploy_OCP_hosted_skip_cnv
DanielOsypenko Feb 22, 2024
7f8c133
change timeout to wait resources
DanielOsypenko Feb 22, 2024
c4907f2
platform changes
DanielOsypenko Feb 22, 2024
a4e3e6d
fix ipaddresspool - IBM
DanielOsypenko Feb 22, 2024
db418ef
redesign HypershiftHostedOCP and ACM
DanielOsypenko Feb 22, 2024
1eaa124
cnv-verification-allow-fail
DanielOsypenko Feb 22, 2024
1ee46ae
deploy_hosted_cluster
DanielOsypenko Feb 22, 2024
27d6aac
added rbd sc set default
DanielOsypenko Feb 24, 2024
20a47bf
check acm exists fix
DanielOsypenko Feb 24, 2024
a490872
fix deploy_acm_hub
DanielOsypenko Feb 24, 2024
fccb0e6
fix operatorgroup metallb
DanielOsypenko Feb 24, 2024
8dd1226
metallb - namespace shadowed, fixed
DanielOsypenko Feb 25, 2024
409541a
fix addresspool for ibm
DanielOsypenko Feb 25, 2024
db84f13
apply network policy to hosted clusters
DanielOsypenko Feb 25, 2024
ae7caa0
metallb instance added
DanielOsypenko Feb 25, 2024
742dfd9
fix verification func for hosted OCP
DanielOsypenko Feb 26, 2024
dc07643
added multiple OCP deployment
DanielOsypenko Feb 28, 2024
00fe9c2
deploy_ocp return statement fixed and other
DanielOsypenko Mar 2, 2024
b037ccf
fix verify_hosted_ocp_cluster_from_provider 2.0
DanielOsypenko Mar 3, 2024
59089cd
subscriptions kind fixed
DanielOsypenko Mar 3, 2024
880c9a5
lowered reqs for hosted cluster create
DanielOsypenko Mar 4, 2024
6dc32fb
renamed clusters
DanielOsypenko Mar 4, 2024
75a5312
added purple squad
DanielOsypenko Mar 4, 2024
58a81bd
test_create_kubeconfig_for_hosted_clusters
DanielOsypenko Mar 5, 2024
f246c74
download_hosted_cluster_kubeconfig adjusted
DanielOsypenko Mar 5, 2024
04e69e0
download_hosted_cluster_kubeconfig adjusted 1.0
DanielOsypenko Mar 5, 2024
b4dcb34
download_hosted_cluster_kubeconfig adjusted 2.0
DanielOsypenko Mar 5, 2024
5fb3810
download_hosted_cluster_kubeconfig 3.0
DanielOsypenko Mar 5, 2024
04dbe21
download_hosted_cluster_kubeconfig with sleep
DanielOsypenko Mar 5, 2024
0155132
experiment
DanielOsypenko Mar 5, 2024
35e681b
download_hosted_cluster_kubeconfig 4.0
DanielOsypenko Mar 5, 2024
5638755
deployHostedODF 1
DanielOsypenko Mar 9, 2024
6780edb
download_hosted_cluster_kubeconfig fix
DanielOsypenko Mar 9, 2024
4dbcb72
network_pol fix
DanielOsypenko Mar 9, 2024
b6cbddf
is_exists with diff kubeconfigs
DanielOsypenko Mar 9, 2024
5de9126
debugprint
DanielOsypenko Mar 9, 2024
e22496e
cluster_conf fix
DanielOsypenko Mar 9, 2024
ea9cee6
cluster_conf fix
DanielOsypenko Mar 9, 2024
742111e
remove debug prints
DanielOsypenko Mar 9, 2024
a694b42
odf installation on client 1.0
DanielOsypenko Mar 10, 2024
bebaddc
odf installation on client 1.1
DanielOsypenko Mar 10, 2024
cfe21f3
odf installation on client 1.2
DanielOsypenko Mar 10, 2024
3bbe527
odf installation on client 1.3
DanielOsypenko Mar 10, 2024
82ce4a0
odf installation on client 1.4
DanielOsypenko Mar 10, 2024
a71ca0e
odf installation on client 1.5
DanielOsypenko Mar 10, 2024
e1f2fca
odf installation on client 1.6
DanielOsypenko Mar 10, 2024
1ae36cc
odf installation on client 1.7
DanielOsypenko Mar 10, 2024
f8fdd28
odf installation on client 1.8
DanielOsypenko Mar 10, 2024
7aca323
odf installation on client 1.9
DanielOsypenko Mar 10, 2024
3772dbe
odf installation on client 1.10
DanielOsypenko Mar 10, 2024
a5d4f5f
odf installation on client 1.11
DanielOsypenko Mar 11, 2024
57b2038
odf installation on client 1.12
DanielOsypenko Mar 11, 2024
87b4b80
odf installation on client 1.13
DanielOsypenko Mar 11, 2024
8656b9a
odf installation on client 1.14
DanielOsypenko Mar 11, 2024
2747521
odf installation on client 1.15
DanielOsypenko Mar 11, 2024
99896a6
odf installation on client 1.16
DanielOsypenko Mar 11, 2024
905a34f
odf installation on client 1.17
DanielOsypenko Mar 11, 2024
17a093b
odf installation on client 1.18
DanielOsypenko Mar 11, 2024
3641e5c
odf installation on client 1.19
DanielOsypenko Mar 11, 2024
44708f9
odf installation on client 1.20
DanielOsypenko Mar 11, 2024
ea52b57
odf installation on client 1.21
DanielOsypenko Mar 11, 2024
a089c47
odf installation on client 1.21
DanielOsypenko Mar 12, 2024
a52bcaf
odf installation on client 1.22
DanielOsypenko Mar 12, 2024
a43a49a
odf installation on client 1.23
DanielOsypenko Mar 12, 2024
d6ac0ed
odf installation on client 1.24
DanielOsypenko Mar 12, 2024
86fc115
odf installation on client 1.25
DanielOsypenko Mar 12, 2024
5333ce1
odf installation on client 1.23
DanielOsypenko Mar 12, 2024
4e9b370
odf installation on client 1.24
DanielOsypenko Mar 12, 2024
6b3f140
odf installation on client 1.25
DanielOsypenko Mar 13, 2024
fe7e8b5
odf installation on client 1.26
DanielOsypenko Mar 13, 2024
089ed29
odf installation on client 1.27
DanielOsypenko Mar 13, 2024
7b2d4ce
odf installation on client 1.28
DanielOsypenko Mar 13, 2024
e6b6729
odf installation on client 1.29
DanielOsypenko Mar 13, 2024
4c9c737
cleanup and review comments 1.0
DanielOsypenko Mar 14, 2024
a170d4d
cleanup and review comments 1.1
DanielOsypenko Mar 15, 2024
fb322f5
omit failure when CNV not installed yet 0.1
DanielOsypenko Mar 17, 2024
4e06826
metallb - wait for csvs added
DanielOsypenko Mar 17, 2024
ae1a37a
metallb - retry for l2adv and rest
DanielOsypenko Mar 17, 2024
6272c47
get kubeconfigs retry
DanielOsypenko Mar 18, 2024
4caf7cd
review fixes, ip addresses static, auth paths customizeable 0.1
DanielOsypenko Mar 24, 2024
a1b70f5
review fixes, ip addresses static, auth paths customizeable 0.2 (reso…
DanielOsypenko Mar 24, 2024
222527d
corrected the yaml files
DanielOsypenko Mar 25, 2024
d84a01b
dont run hcp create if cluster exists
DanielOsypenko Mar 27, 2024
726e7af
verify csv installed metallb and odf
DanielOsypenko Mar 27, 2024
962fc1b
review fixes, documentation
DanielOsypenko Mar 29, 2024
4e39a02
cleanup env vars
DanielOsypenko Apr 1, 2024
56b4f64
metallb wait csv fix
DanielOsypenko Apr 1, 2024
cc6e496
hcp update, remove hcp container
DanielOsypenko Apr 1, 2024
c4a3826
hcp update, remove hcp container 0.1
DanielOsypenko Apr 1, 2024
917b901
hcp update, remove hcp container 0.2
DanielOsypenko Apr 1, 2024
1939993
added annotation to skip release check on hcp creation
DanielOsypenko Apr 2, 2024
65028c6
added annotation to skip release check on hcp creation 0.1
DanielOsypenko Apr 2, 2024
40761ed
install_hcp_and_hypershift_from_git 0.1
DanielOsypenko Apr 2, 2024
4a89782
install_hcp_and_hypershift_from_git 0.2
DanielOsypenko Apr 2, 2024
c7230dd
install_hcp_and_hypershift_from_git 0.3
DanielOsypenko Apr 2, 2024
c112717
install_hcp_and_hypershift_from_git 0.4
DanielOsypenko Apr 2, 2024
eb47d83
install_hcp_and_hypershift_from_git 0.4
DanielOsypenko Apr 2, 2024
5fc3fd9
install_hcp_and_hypershift_from_git 0.5
DanielOsypenko Apr 2, 2024
fa85f3b
metallb_wait_csv
DanielOsypenko Apr 4, 2024
b247768
install metallb of latest version
DanielOsypenko Apr 8, 2024
8a069c5
install nightly OCP on hosted clusters
DanielOsypenko Apr 8, 2024
61bf5d2
adjust odf provision on 4.16
DanielOsypenko Apr 8, 2024
d5645ca
install upstream hypershift
DanielOsypenko Apr 8, 2024
ea3a36e
nodepool_replicas added
DanielOsypenko Apr 8, 2024
1a24cbe
hyperconverged installed 0.1
DanielOsypenko Apr 8, 2024
5adfa44
hyperconverged installed 0.2
DanielOsypenko Apr 8, 2024
d6d5f7d
hyperconverged installed 0.3
DanielOsypenko Apr 9, 2024
7a5f3a8
doc upd 0.1
DanielOsypenko Apr 9, 2024
3c72ecb
import error 0.1
DanielOsypenko Apr 9, 2024
c059c82
hosted ODF PackageManifest call fix
DanielOsypenko Apr 9, 2024
6c2f6b3
mce check removed
DanielOsypenko Apr 10, 2024
f6bccc8
hypershift upstream Fix 0.1
DanielOsypenko Apr 10, 2024
20e9d30
metallb kind - wait added
DanielOsypenko Apr 10, 2024
382e1d6
added hypershift_upstream_installed to check if upstream installed 0.1
DanielOsypenko Apr 10, 2024
8668f66
fix optional catalogsource
DanielOsypenko Apr 16, 2024
e893c92
avoid install metallb second time 0.1
DanielOsypenko Apr 16, 2024
7e33965
minor fixes 0.1
DanielOsypenko May 1, 2024
19b8d10
tmp-image-changed-odf-client
DanielOsypenko May 1, 2024
49ab009
timeout verify client installation increased
DanielOsypenko May 1, 2024
8baaf6b
odf-registry-dynamic
DanielOsypenko May 1, 2024
3fccd0c
remove catalog-pods-check
DanielOsypenko May 1, 2024
0412ad9
add install_hypershift_upstream env into config
DanielOsypenko May 1, 2024
8bc7266
change hypershift create command
DanielOsypenko May 1, 2024
3e98e6b
minor fix 0.2
DanielOsypenko May 1, 2024
20e685a
minor fix 0.3
DanielOsypenko May 2, 2024
8b4d7e4
customize cnv ver and ocp ver
DanielOsypenko May 14, 2024
ca35c60
remove automatic upgrade plan
DanielOsypenko May 14, 2024
8658d28
return back hyperconverged yaml
DanielOsypenko May 14, 2024
4d289d1
check cnv ready fix
DanielOsypenko May 14, 2024
71c3310
fix metallb operatorgroup
DanielOsypenko May 14, 2024
8b8a020
retry when failed calling webhook \"ipaddresspoolvalidationwebhook.me…
DanielOsypenko May 15, 2024
ee4b25b
fixed location of path in cluster config
DanielOsypenko May 15, 2024
999ecd6
add redundancy to create metallb, storageClient tune to 4.16
DanielOsypenko May 16, 2024
ccd7121
add check storageclass exists
DanielOsypenko May 16, 2024
0f3065e
storage-claim funcs updated
DanielOsypenko May 17, 2024
ec24eb0
review fix DanielH,Filip
DanielOsypenko May 22, 2024
22ed0d1
timeouts increased as from results on BM3
DanielOsypenko May 22, 2024
9f0bd9e
circular import resolved
DanielOsypenko May 23, 2024
2607c56
kubeconf path fixed
DanielOsypenko May 23, 2024
c4cbd10
correct default channel to allow ODF N+1
DanielOsypenko May 23, 2024
451cc67
add fields to example yaml
DanielOsypenko May 23, 2024
a5f2fd1
cosmetic 0.1
DanielOsypenko May 23, 2024
5b0883e
cosmetic 0.3
DanielOsypenko May 23, 2024
f30ee1c
rbd sc renamed
DanielOsypenko May 23, 2024
88023e0
Merge branch 'master' into deploy_hosted_cluster
dahorak May 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions conf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ anywhere else.
* `skip_ocp_installer_destroy` - Skip OCP installer to destroy the cluster -
useful for enforcing force deploy steps only.
* `sts_enabled` - Enable STS deployment functionality.
* `metallb_operator` - Enable MetalLB operator installation during OCP deployment.
* `multi_storagecluster` - Enable multi-storagecluster deployment when set to true.

#### REPORTING
Expand Down Expand Up @@ -300,6 +301,18 @@ higher priority).
* `private_gw` - GW for the private interface
* `root_disk_id` - ID of the root disk
* `root_disk_sn` - Serial number of the root disk
* `hcp_version` - version of HCP client to be deployed on machine running the tests
* `metallb_version` - MetalLB operator version to install
* `install_hypershift_upstream` - Install hypershift from upstream or not (Default: false). Necessary for unreleased OCP/CNV versions
* `clusters` - section for hosted clusters
* `<cluster name>` - name of the cluster
* `hosted_cluster_path` - path to the cluster directory to store auth_path, credentials files or cluster related files
* `ocp_version` - OCP version of the hosted cluster (e.g. "4.15.13")
* `cpu_cores_per_hosted_cluster` - number of CPU cores per hosted cluster
* `memory_per_hosted_cluster` - amount of memory per hosted cluster
* `nodepool_replicas` - number of replicas of nodepool for each cluster
* `hosted_odf_registry` - registry for hosted ODF
* `hosted_odf_version` - version of ODF to be deployed on hosted clusters

Copy link
Contributor

Choose a reason for hiding this comment

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

Very helpful document

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

#### UPGRADE

Expand Down
2 changes: 1 addition & 1 deletion conf/deployment/vsphere/ai_1az_rhcos_vsan_3m_3w_hci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# This config is suppose to work on DC-CP, DC-ECO, DC-PS
DEPLOYMENT:
allow_lower_instance_requirements: false
cnv_deployment: True
ENV_DATA:
platform: 'vsphere'
deployment_type: 'ai'
Expand All @@ -14,4 +15,3 @@ ENV_DATA:
extra_disks: 2
control_plane_extra_disks: 2
fio_storageutilization_min_mbps: 10.0
cnv_deployment: True
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This yaml file contains the configuration for the deployment of the ACM hub cluster on IBM Cloud Bare Metal
# with Hosted client clusters. The configuration is used by the HyperShiftBase.download_hcp_binary(),
# HostedClients.deploy_hosted_ocp_clusters(), HypershiftHostedOCP.deploy_ocp(), HostedODF.do_deploy(),
# MetallbOperator.deploy_metallb() and similar methods during the Hosted clusters deployment.
# The configuration is for observation purposes only and is not intended to be executed. In order to execute
# the configuration, the user must provide the desired values for the variables in the configuration.

---
DEPLOYMENT:
cnv_deployment: true
metallb_operator: true
cnv_latest_stable: true
local_storage: true
ENV_DATA:
platform: "hci_baremetal"
cluster_type: "provider" # it is necessary to run the Hosted clusters deployment on the Provider cluster
deploy_acm_hub_cluster: true
acm_version: "2.10" # this is an example, please provide the desired version
acm_hub_channel: "release-2.10" # this is an example, please provide the desired version
hcp_version: "4.16" # this is an example, please provide the desired version
metallb_version: "4.16" # this is an example, please provide the desired version
clusters: # the list of the Hosted clusters and their configuration. If field does not exist HostedClsuter installation will be skipped
hcp415-bm3-e: # the field name is the name of the Hosted cluster
hosted_cluster_path: "~/clusters/hcp416-bm3-e/openshift-cluster-dir" # path to store auth_path dir or cluster related files
ocp_version: "4.15.13" # this is an example, please provide the desired OCP version
cpu_cores_per_hosted_cluster: 6 # minimal, tested value for the kubevirt cluster is 6
memory_per_hosted_cluster: "12Gi" # minimal, tested value for the kubevirt cluster is 12Gi
hosted_odf_registry: "quay.io/rhceph-dev/ocs-registry" # this is an example, please provide the desired registry
hosted_odf_version: "4.16.0-99" # this is an example, please provide the desired version
setup_storage_client: true # if true, the Storage Client will be created and verification will be performed
nodepool_replicas: 3 # number of worker nodes created for Hosted cluster
hcp415-bm3-f:
hosted_cluster_path: "~/clusters/hcp416-bm3-f/openshift-cluster-dir" # path to store auth_path dir or cluster related files
ocp_version: "4.15.10" # this is an example, please provide the desired OCP version
cpu_cores_per_hosted_cluster: 8 # minimal, tested value for the kubevirt cluster is 6
memory_per_hosted_cluster: "12Gi" # minimal, tested value for the kubevirt cluster is 12Gi
hosted_odf_registry: "quay.io/rhceph-dev/ocs-registry" # this is an example, please provide the desired registry
hosted_odf_version: "4.16.0-106" # this is an example, please provide the desired version
setup_storage_client: true # if true, the Storage Client will be created and verification will be performed
nodepool_replicas: 2 # number of worker nodes created for Hosted cluster
3 changes: 3 additions & 0 deletions conf/ocsci/hcp_4.14.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ENV_DATA:
hcp_version: "4.14"
3 changes: 3 additions & 0 deletions conf/ocsci/hcp_4.15.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ENV_DATA:
hcp_version: "4.15"
3 changes: 3 additions & 0 deletions conf/ocsci/hcp_4.16.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ENV_DATA:
hcp_version: "4.16"
5 changes: 5 additions & 0 deletions conf/ocsci/metallb_4.14.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
DEPLOYMENT:
metallb_operator: true
ENV_DATA:
metallb_version: "4.14"
5 changes: 5 additions & 0 deletions conf/ocsci/metallb_4.15.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
DEPLOYMENT:
metallb_operator: true
ENV_DATA:
metallb_version: "4.15"
5 changes: 5 additions & 0 deletions conf/ocsci/metallb_4.16.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
DEPLOYMENT:
metallb_operator: true
ENV_DATA:
metallb_version: "4.16"
Loading
Loading