Adding Vsphere Functionality to deployment

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

@@ -2,7 +2,7 @@
 name: Build and Publish
 on:
   push:
-    branches: [main]
+    branches: [main, vsphere]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

Makefile

@@ -1,6 +1,8 @@
 CI_FOLDER = images
-PIPE_IMAGE ?= quay.io/ztpfw/pipeline
-UI_IMAGE = quay.io/ztpfw/ui
+#Default: PIPELINE_ACCOUNT = ztpfw
+PIPELINE_ACCOUNT = takinosh
+PIPE_IMAGE ?= quay.io/${PIPELINE_ACCOUNT}/pipeline
+UI_IMAGE = quay.io/${PIPELINE_ACCOUNT}/ui
 BRANCH ?= $(shell git branch --show-current | tr '[:upper:]' '[:lower:]' | tr '\/' '-')
 HASH := $(shell git rev-parse HEAD)
 RELEASE ?= latest

contrib/deploy-aap/01-namespace.yml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: ansible-automation-platform

contrib/deploy-aap/02-operatorgroup.yml

@@ -0,0 +1,7 @@
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: ansible-automation-platform
+  namespace: ansible-automation-platform
+spec: {}

contrib/deploy-aap/03-subscription.yml

@@ -0,0 +1,13 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  labels:
+    operators.coreos.com/ansible-automation-platform-operator.ansible-automation-platfor: ''
+  name: ansible-automation-platform-operator
+  namespace: ansible-automation-platform
+spec:
+  channel: stable-2.1-cluster-scoped
+  installPlanApproval: Automatic
+  name: ansible-automation-platform-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace

contrib/deploy-aap/04-instance.yml

@@ -0,0 +1,43 @@
+apiVersion: automationcontroller.ansible.com/v1beta1
+kind: AutomationController
+metadata:
+  labels:
+    app.kubernetes.io/component: automationcontroller
+    app.kubernetes.io/managed-by: automationcontroller-operator
+    app.kubernetes.io/name: ac-tower
+    app.kubernetes.io/operator-version: ''
+    app.kubernetes.io/part-of: ac-tower
+  name: ac-tower
+  namespace: ansible-automation-platform
+spec:
+  ee_resource_requirements:
+    limits:
+      cpu: 2000m
+    requests:
+      cpu: 500m
+  create_preload_data: true
+  route_tls_termination_mechanism: Edge
+  garbage_collect_secrets: false
+  loadbalancer_port: 80
+  projects_use_existing_claim: _No_
+  task_resource_requirements:
+    limits:
+      cpu: 2000m
+    requests:
+      cpu: 500m
+  image_pull_policy: IfNotPresent
+  projects_storage_size: 8Gi
+  admin_email: [email protected]
+  task_privileged: false
+  projects_storage_class: ocs-storagecluster-ceph-rbd
+  projects_storage_access_mode: ReadWriteOnce
+  web_resource_requirements:
+    limits:
+      cpu: 2000m
+    requests:
+      cpu: 500m
+  projects_persistence: true
+  replicas: 1
+  admin_user: admin
+  loadbalancer_protocol: http
+  nodeport_port: 30080

contrib/deploy-aap/deploy.sh

@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -o nounset
+set -o errexit
+set -m
+
+# variables
+# #########
+# uncomment it, change it or get it from gh-env vars (default behaviour: get from gh-env)
+# export KUBECONFIG=/root/admin.kubeconfig
+
+if ./verify.sh; then
+
+    # Load common vars
+    source ${WORKDIR}/shared-utils/common.sh
+
+    oc apply -f 01-namespace.yml
+    sleep 2
+
+    echo ">>>> Deploy manifests to install AAP"
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    oc apply -f 02-operatorgroup.yml
+    sleep 10
+    oc apply -f 03-subscription.yml -o yaml --dry-run=client | oc apply -f -
+
+    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
+
+
+    echo ">>>> Deploy AAP instance"
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    oc apply -f 04-instance.yml
+
+
+    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))
+elif [[ $? -eq 50 ]]; then
+    echo ">>>> Verify failed...Some pods are failing..." #TODO change to remove and launch again
+    exit 50
+else
+    echo ">>>> This step is not neccesary, everything looks ready"
+fi
+echo ">>>>EOF"
+echo ">>>>>>>"

contrib/deploy-aap/verify.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -o nounset
+set -m
+
+# variables
+# #########
+# uncomment it, change it or get it from gh-env vars (default behaviour: get from gh-env)
+# export KUBECONFIG=/root/admin.kubeconfig
+
+# Load common vars
+source ${WORKDIR}/shared-utils/common.sh
+
+echo "development"
+echo ">>>>EOF"
+echo ">>>>>>>"

contrib/deploy-argocd/01-namespace.yml

@@ -0,0 +1,4 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: argocd

contrib/deploy-argocd/02-subscription.yml

@@ -0,0 +1,16 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  creationTimestamp: null
+  name: openshift-gitops-operator
+  namespace: openshift-operators
+spec:
+  channel: stable
+  installPlanApproval: Automatic
+  name: openshift-gitops-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+  config:
+    env:
+    - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES
+      value: '*'

contrib/deploy-argocd/03-instance.yml

@@ -0,0 +1,123 @@
+kind: ArgoCD
+apiVersion: argoproj.io/v1alpha1
+metadata:
+  creationTimestamp: null
+  name: openshift-gitops
+  namespace: argocd
+spec:
+  controller:
+    processors: {}
+    resources:
+      limits:
+        cpu: 2000m
+        memory: 2048Mi
+      requests:
+        cpu: 250m
+        memory: 1024Mi
+    sharding: {}
+  dex:
+    openShiftOAuth: true
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 250m
+        memory: 128Mi
+  ha:
+    enabled: false
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 250m
+        memory: 128Mi
+  redis:
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 250m
+        memory: 128Mi
+  repo:
+    resources:
+      limits:
+        cpu: 1000m
+        memory: 1Gi
+      requests:
+        cpu: 250m
+        memory: 256Mi
+  server:
+    autoscale:
+      enabled: false
+    grpc:
+      ingress:
+        enabled: false
+    ingress:
+      enabled: false
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 125m
+        memory: 128Mi
+    insecure: true
+    replicas: 1
+    route:
+      enabled: true
+      tls:
+        termination: edge
+        insecureEdgeTerminationPolicy: Redirect
+    service:
+      type: ''
+  grafana:
+    enabled: false
+    size: 1
+    ingress:
+      enabled: false
+    route:
+      enabled: false
+      tls:
+        termination: edge
+        insecureEdgeTerminationPolicy: Redirect
+  prometheus:
+    enabled: false
+    ingress:
+      enabled: false
+    route:
+      enabled: false
+      tls:
+        termination: edge
+        insecureEdgeTerminationPolicy: Redirect
+  initialSSHKnownHosts: {}
+  applicationSet:
+    resources:
+      limits:
+        cpu: '2'
+        memory: 1Gi
+      requests:
+        cpu: 250m
+        memory: 512Mi
+  rbac:
+    defaultPolicy: 'role:admin'
+    policy: |
+      g, cluster-admins, role:admin
+      g, admins, role:admin
+    scopes: '[groups]'
+  resourceExclusions: |
+    - apiGroups:
+      - internal.open-cluster-management.io
+      kinds:
+      - ManagedClusterInfo
+      clusters:
+      - "*"
+    - apiGroups:
+      - tekton.dev
+      clusters:
+      - '*'
+      kinds:
+      - TaskRun
+      - PipelineRun

contrib/deploy-argocd/deploy.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -o nounset
+set -o errexit
+set -m
+
+# variables
+# #########
+# uncomment it, change it or get it from gh-env vars (default behaviour: get from gh-env)
+# export KUBECONFIG=/root/admin.kubeconfig
+
+if ./verify.sh; then
+
+    # Load common vars
+    source ${WORKDIR}/shared-utils/common.sh
+
+    oc apply -f 01-namespace.yml
+
+    echo ">>>> Deploy manifests to install OpenShift Gitops "
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    oc apply -f 02-subscription.yml -o yaml --dry-run=client | oc apply -f -
+
+    OC_COMMAND=$(oc get csv -n argocd | grep "Red Hat OpenShift GitOps" | grep Succeeded | wc -l)
+    timeout=0
+    while [ "${timeout}" -lt "120" ]; do
+        if [[ ${OC_COMMAND} -eq 1 ]]; then
+            ready=true
+            break
+        fi
+        echo "Wait for Red Hat OpenShift GitOps"
+        sleep 5
+        timeout=$((timeout + 1))
+        OC_COMMAND=$(oc get csv -n argocd | grep "Red Hat OpenShift GitOps" | grep Succeeded | wc -l)
+    done
+
+    echo ">>>> Deploy OpenShift Gitops instance"
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    oc apply -f 03-instance.yml
+
+    echo ">>>> Wait until OpenShift Gitops ready"
+    echo ">>>>>>>>>>>>>>>>>>>>>>>>>"
+    timeout=0
+    ready=false
+    sleep 240
+    while [ "${timeout}" -lt "120" ]; do
+        if [[ $(oc get pod -n argocd | grep -i running | wc -l) -eq $(oc get pod -n argocd | grep -v NAME | wc -l) ]]; then
+            ready=true
+            break
+        fi
+        sleep 5
+        timeout=$((timeout + 1))
+elif [[ $? -eq 50 ]]; then
+    echo ">>>> Verify failed...Some pods are failing..." #TODO change to remove and launch again
+    exit 50
+else
+    echo ">>>> This step is not neccesary, everything looks ready"
+fi
+echo ">>>>EOF"
+echo ">>>>>>>"