Adding Vsphere Functionality to deployment #489

tosin2013 · 2022-07-20T18:11:12Z

Description

Adding vShpere functionality to integrate with the following repo https://github.com/Red-Hat-SE-RTO/openshift-ztp.

Fixes # (issue)

Type of change

Please select the appropriate options:

Bug fix (non-breaking change which fixes an issue)
[X ] New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
[X ] This change requires a documentation update
This change is a documentation update

Testing

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Test A
Test B

Test Configuration:

Versions:
Hardware:

Checklist

I have performed a self-review of my own code
If a change is adding a feature, it should require a change to the README.md and the review should catch this.
If the change is a fix, it should have an issue. The review should make sure the comments state the issue (not just the number) and it should use the keywords that will close the issue on merge.
A change should not be merged unless it passes CI or there is a comment/update saying what testing was passed.
PRs should not be merged unless positively reviewed.

alknopfler · 2022-07-27T09:43:49Z

ready to review or draft yet?

tosin2013 · 2022-07-27T12:11:55Z

ready to review or draft yet?

I am working on the code now I will have a draft of the steps later today.

.github/workflows/build-and-push-release.yml

Makefile

alknopfler · 2022-07-28T08:07:37Z

contrib/deploy-aap/deploy.sh

+    OC_COMMAND=$(oc get csv -n ansible-automation-platform | grep "Ansible Automation Platform" | grep Succeeded | wc -l)
+    timeout=0
+    while [ "${timeout}" -lt "120" ]; do
+        if [[ ${OC_COMMAND} -eq 1 ]]; then
+            ready=true
+            break
+        fi
+        echo "Wait for Ansible Automation Platform"
+        sleep 5
+        timeout=$((timeout + 1))
+        OC_COMMAND=$(oc get csv -n ansible-automation-platform | grep "Ansible Automation Platform" | grep Succeeded | wc -l)
+    done


In the common.sh file there is a check_resources which do exactly this part. An example:

echo "Installing NFD operator for ${edgecluster}" oc --kubeconfig=${EDGE_KUBECONFIG} apply -f manifests/01-nfd-namespace.yaml sleep 2 oc --kubeconfig=${EDGE_KUBECONFIG} apply -f manifests/02-nfd-operator-group.yaml sleep 2 oc --kubeconfig=${EDGE_KUBECONFIG} apply -f manifests/03-nfd-subscription.yaml sleep 2 check_resource "crd" "nodefeaturediscoveries.nfd.openshift.io" "Established" "openshift-nfd" "${EDGE_KUBECONFIG}"

alknopfler · 2022-07-28T08:08:08Z

contrib/deploy-aap/deploy.sh

+    echo ">>>> Wait until acm ready"
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>"
+    timeout=0
+    ready=false
+    sleep 240
+    while [ "${timeout}" -lt "120" ]; do
+        if [[ $(oc get pod -n ansible-automation-platform | grep  ac-  | grep -i running | wc -l) -eq $(oc get pod -n ansible-automation-platform | grep  ac-  | wc -l) ]]; then
+            ready=true
+            break
+        fi
+        sleep 5
+        timeout=$((timeout + 1))


same than before

alknopfler · 2022-07-28T08:11:39Z

contrib/deploy-aap/verify.sh

+# Load common vars
+source ${WORKDIR}/shared-utils/common.sh
+
+echo "development"


Just to make it clear, the idea of the contrib framework is to have an interface with 2 functions:

Deploy.sh -> deploy resources for a specific resource/operator/item

Verify.sh -> verify if there's present to skip this task. The verification should be a functional test to know if the resources are ready and running.

So, said that, in this part an example of verify could be:

Verify.sh

alknopfler · 2022-07-28T08:13:46Z

contrib/deploy-argocd/verify.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash


same than before ;)

alknopfler · 2022-07-28T08:14:29Z

contrib/deploy-gitea/01-namespace.yml

@@ -0,0 +1,4 @@
+kind: Namespace


Why do we need gitea? Maybe I'm wrong or missing something but I think we don't need argocd to deploy it

gitea is used for organizations that do not have access to github.com or bitbucket to stand up a repo and point to this one https://github.com/Red-Hat-SE-RTO/openshift-ztp. There are some users that have proxy issues or firewall issues that do not allow them to access git repo.

alknopfler · 2022-07-28T08:28:07Z

pipelines/resources/deploy-ztp-vsphere.yaml

@@ -0,0 +1,94 @@
+apiVersion: tekton.dev/v1beta1


this file should be placed on folder contrib like:
https://github.com/rh-ecosystem-edge/ztp-pipeline-relocatable/tree/33f65288208908623e96fd82269bd381c0ba6560/pipelines/resources/contrib
this is the way to use contrib resources in our pipeline

also there, you've got a template file created just to copy and paste modifying the resources and deployments you need to use in your case

alknopfler · 2022-07-28T08:30:10Z

pipelines/resources/kustomization.yaml

@@ -8,5 +8,6 @@ resources:
  - deploy-ztp-hub-mce.yaml
  - deploy-ztp-edgeclusters.yaml
  - deploy-ztp-edgeclusters-sno.yaml
+  - deploy-ztp-vsphere.yaml


same the folder is contrib/

alknopfler · 2022-07-28T08:31:56Z

shared-utils/verify_preflight.sh

@@ -88,9 +88,15 @@ fi

 echo ">>>> Verify oc get nodes"
 echo ">>>>>>>>>>>>>>>>>>>>>>>>>"
-if [[ $(oc get nodes | grep -i ready | wc -l) -ne 1 ]] && [[ $(oc get nodes | grep -i ready | wc -l) -ne 3 ]]; then
+# TO-DO: Installed Vshpere with assisted installer and enable vshpere during deployment


don't understand this comment TO-DO, why do you need to install vsphere with AI?

Right one my vSphere cluster has 3 masters and 3 workers so it is failing on the check. I wanted to add the vShpere check because I know that baremetal can be sno or 3 nodes. vShpere can have more that 3 worker nodes in some environments.

alknopfler · 2022-07-28T08:33:45Z

First of all thanks @tosin2013 for the contribution, I've done a previous review just to give you some feedback. If you need help or make something more clear just ping me ok?

…le into vsphere

github-actions · 2022-11-22T16:17:39Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

adding aap argocd and gitea for vsphere

74a7c22

github-actions bot added size/XL contrib labels Jul 20, 2022

tosin2013 added 3 commits July 27, 2022 15:31

Merge branch 'main' into vsphere

1166b3a

updating code

c7287b7

adding deploy-ztp-vsphere pipeline

810e8a4

github-actions bot added the pipelines label Jul 27, 2022

updating validation check

4c124b8

github-actions bot added the internal label Jul 28, 2022

tosin2013 added 8 commits July 27, 2022 21:49

testing build

1fd045c

building container to test with

43b69e3

correcting line 5

d010656

correcting line 5

abafd2d

adding quotes to make file

581a949

changing quay user

eaa7c6c

testing preflight script

4af1708

adding to-do

c31bb37

github-actions bot added the github-actions label Jul 28, 2022

alknopfler suggested changes Jul 28, 2022

View reviewed changes

tosin2013 and others added 8 commits July 28, 2022 21:35

updating code

fee4bed

updating code

3c58dbc

Merge branch 'main' into vsphere

67b528e

updating contrib folder

ff681bf

correcting ansible check

e649df3

adding deploy-openshift-ztp-vshpere.yaml template

2d2ce40

Merge branch 'rh-ecosystem-edge:main' into main

b85a4fb

removing deploy-ztp-vsphere.yaml

b99252a

tosin2013 and others added 11 commits August 8, 2022 14:27

testing ansible

e7d801d

testing pull secret

2c6e595

adding more stuff to install

ce9fcce

ansible_python_interpreter=/usr/bin/python3

3b086e8

adding -vv

ef14135

adding multiclusterhub dependency

abba130

update code

5425f28

Merge branch 'rh-ecosystem-edge:main' into main

1e89864

updating

ec418ed

Merge branch 'main' into vsphere

4f31697

adding s3 download for tower manifest

3276326

github-actions bot added the documentation Improvements or additions to documentation label Aug 11, 2022

tosin2013 and others added 16 commits August 11, 2022 12:59

updating code

1d87f66

updating code

377f11a

updating code

686b025

Merge branch 'vsphere' of github.com:tosin2013/ztp-pipeline-relocatab…

04b7d2c

…le into vsphere

updating code

f5f7b7d

updating code

33dafd4

adding vsphere creds

a0655cd

adding comment

1262656

Merge branch 'rh-ecosystem-edge:main' into main

3de8eea

Merge branch 'rh-ecosystem-edge:main' into main

f847c43

updating dir

49c90dd

Merge branch 'main' into vsphere

938b442

updating

43c39a5

updating

5ca3528

Merge branch 'rh-ecosystem-edge:main' into vsphere

ec174a5

updating ansbile pipeline

f807806

github-actions bot added the needs rebase label Nov 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding Vsphere Functionality to deployment #489

Adding Vsphere Functionality to deployment #489

tosin2013 commented Jul 20, 2022

alknopfler commented Jul 27, 2022

tosin2013 commented Jul 27, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

tosin2013 Jul 29, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

alknopfler Jul 28, 2022

tosin2013 Jul 29, 2022

alknopfler commented Jul 28, 2022

github-actions bot commented Nov 22, 2022

Adding Vsphere Functionality to deployment #489

Are you sure you want to change the base?

Adding Vsphere Functionality to deployment #489

Conversation

tosin2013 commented Jul 20, 2022

Description

Type of change

Testing

Checklist

alknopfler commented Jul 27, 2022

tosin2013 commented Jul 27, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alknopfler commented Jul 28, 2022

github-actions bot commented Nov 22, 2022