Apic multicloud use case (cloud-native-toolkit#154)

* APIC multicloud use case Signed-off-by: Jesus Almaraz <jesus.mah@gmail.com> * APIC multicloud use case Signed-off-by: Jesus Almaraz <jesus.mah@gmail.com>
hollisc · Nov 10, 2021 · bef8350 · bef8350
1 parent 78b9326
commit bef8350
Showing 367 changed files with 12,186 additions and 50 deletions.
diff --git a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/1-infra.yaml b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/1-infra.yaml
@@ -40,6 +40,12 @@ spec:
     server: https://kubernetes.default.svc
   - namespace: openshift-cluster-node-tuning-operator
     server: https://kubernetes.default.svc
+  - namespace: spp
+    server: https://kubernetes.default.svc
+  - namespace: spp-velero
+    server: https://kubernetes.default.svc
+  - namespace: baas
+    server: https://kubernetes.default.svc
   clusterResourceWhitelist:
   - group: ""
     kind: Namespace

diff --git a/.../others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-baas.yaml b/.../others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-baas.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: namespace-baas
+  labels:
+    gitops.tier.layer: infra
+  annotations:
+    argocd.argoproj.io/sync-wave: "100"
+spec:
+  destination:
+    namespace: openshift-gitops
+    server: https://kubernetes.default.svc
+  project: infra
+  source:
+    path: namespaces/baas
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/...1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-istio-system.yaml b/...1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-istio-system.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: istio-system
+  name: namespace-istio-system
   labels:
     gitops.tier.layer: infra
   annotations:

diff --git a/...s/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-spp-velero.yaml b/...s/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-spp-velero.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: namespace-spp-velero
+  labels:
+    gitops.tier.layer: infra
+  annotations:
+    argocd.argoproj.io/sync-wave: "100"
+spec:
+  destination:
+    namespace: openshift-gitops
+    server: https://kubernetes.default.svc
+  project: infra
+  source:
+    path: namespaces/spp-velero
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/...p/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-spp.yaml b/...p/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-spp.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: namespace-spp
+  labels:
+    gitops.tier.layer: infra
+  annotations:
+    argocd.argoproj.io/sync-wave: "100"
+spec:
+  destination:
+    namespace: openshift-gitops
+    server: https://kubernetes.default.svc
+  project: infra
+  source:
+    path: namespaces/spp
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/...others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-tools.yaml b/...others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/argocd/namespace-tools.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: tools
+  name: namespace-tools
   labels:
     gitops.tier.layer: infra
   annotations:

diff --git a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/kustomization.yaml b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/1-infra/kustomization.yaml
@@ -13,6 +13,9 @@ resources:
 #- argocd/namespace-tools.yaml
 #- argocd/namespace-instana-agent.yaml
 #- argocd/namespace-openshift-storage.yaml
+#- argocd/namespace-spp.yaml
+#- argocd/namespace-spp-velero.yaml
+#- argocd/namespace-baas.yaml
 #- argocd/storage.yaml
 #- argocd/infraconfig.yaml
 #- argocd/machinesets.yaml

diff --git a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/2-services.yaml b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/2-services.yaml
@@ -38,6 +38,12 @@ spec:
     server: https://kubernetes.default.svc
   - namespace: openshift-gitops
     server: https://kubernetes.default.svc
+  - namespace: spp
+    server: https://kubernetes.default.svc
+  - namespace: spp-velero
+    server: https://kubernetes.default.svc
+  - namespace: baas
+    server: https://kubernetes.default.svc
   clusterResourceWhitelist:
   # TODO: SCC needs to be moved to 1-infra, here for now for artifactory
   - group: "security.openshift.io"

diff --git a/...ared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/baas-instance.yaml b/...ared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/baas-instance.yaml
@@ -0,0 +1,68 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: baas-instance
+  annotations:
+    argocd.argoproj.io/sync-wave: "220"
+  labels:
+    gitops.tier.group: spp
+    gitops.tier.layer: services
+spec:
+  ignoreDifferences:
+  - kind: ServiceAccount
+    jsonPointers:
+    - /imagePullSecrets
+  - group: ''
+    kind: PersistentVolumeClaim
+    jsonPointers:
+    - "/metadata/finalizers"
+  - kind: SecurityContextConstraints
+    group: security.openshift.io
+    jsonPointers:
+    - /volumes
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+  destination:
+    namespace: baas
+    server: https://kubernetes.default.svc
+  project: services
+  source:
+    path: instances/baas-instance
+    helm:
+      values: |
+        baas-supplemental:
+          baassecret:
+            data:
+              baasadmin: AgBBL2lBFTblnmAKC7j2RurkJzoHgPsNNLyULMozYQvaDDwQnUtxu2ga3Fviqi1TwzTK42FXfur5OpBfqLwsX4e8qoY8MJkzAqFcCUrbvJWiO5NOrYOLdzxwTFzKGkEyGqfSrijpvu/Iq6yR5+YTJtYfipkFHSsxUUspPcQzrnULdaAhZ4HSXLSTo+giKy9RY6dL/2LUcPStQSshNRzBon1wokmfzzOBgzweDMAuR1LsPy3tDsEXSX84bkp/OsJtHKVxu76cLCfeN24ReCOJ2cL2g086Axqq+FdzRE22eRjt7oM3LQ4H2tJfvR/NRyTe2s+VcjD5Q16TpY7jMIirxKL1cD8ubczDkPS2qtTjObT8nSTFIHcnK29yn5vimE3qAyTdr4QNl23T/TD2H6wpDQkspUIdnWxm3AXwAut1+j1utAUUAgUBd9tyocthCRBsyw79j1OYlgP1pSyHGfk4dwluMmSf7fbCqdoob48txGadWMssRGW8gldf/NjMc3T+3OSJM7K5iSEp+qjvhuPn4sPetiqDy3D5wVs2OHyYIdxGOHmshJHo91dlbD7Kffiv61maLUHfnSRN7osKqSjPd2XHuQeZ+MQtzEABa1reDAvcubTabaPzbnfnyU6W7PCBEOSCPjDPdYQXufZezwg1rjhLXrUkrnac7mn97tHCvjT8fCAG8TIdo/heUMyR5c08DBsYjOeVG6oNvA==
+              baaspassword: AgBcIv43IBVpzVb2oWMtHqBoYzgIP7YkQCKIoLOahyw7SeLWw/aW3MmZTwPKdsZTqavKsSCN6PiR78nsHnZWHJQ9W8i1agEqZfXLq86E1n0aDQLugYHfmKDYltUzPkulFeYWcuP4YEM9qSPyzcopEHNdU1slbSgTo4JSymeACJHD6BGIKW0KiFRYd2thAvf+8+Ry+i0S3ak7JkA59Nbt2FkawUTR0sf2fmhTq75v800v/BgCU4jrgoUhjWQjWpPD/ttGMuU+1krD5IF+ht+ZjKEUgNAuVkng6iEDRyJjXfsrc3OCnEkAhFVs+D4NEPgGbyQpv1gnrYkOkZ18Cdb3un4KmLiZvDbfOYF+VNpyPZOm8m4wVN5AKkl8Sgrku85HOw0dy5WiSfPXGbJpGlN1rMiU3Fa+x3tCS3ywPzBn4+SDfLc6V/u5rOW2yFg9FyPwLemoY9USHxqaRZZjKsUBcWeMjYYQKRbjObst4kcCdQAsNLTWRaC48kt/Yava/wwwNz4jWA7VVj5d5peoCsW6r1a7Ri/CmVlIakB0v5v4RLa0rS2NJlvjDSqnLgzXNZo1z5JQlF8TTODXpzjODVYiV9BmBGSbObiITdL8smR4eVMqnXnpQ7LX32wuIcYMXM5ogVcgdlaJ2E4/ewEuThexYgXjr9tUsx1Dv0m+IsN0ByuBDuajTb/M1R7kM4WkAxUKu03Z62Uk02LzlA==
+              datamoverpassword: AgBa6ZaI7XPBmLkhYphORfdg5XetMhTslmL8RbAYS9Ocllq6JenYloC+wV2UptUIDGXbzCPXI3QChfKiAhGBmAn0yp+7KIPhXuErKq9LmfxrlnHXY83My3FzimV1SgwtojY6qXXwwjmMHmhwdZJaJhQAYHWSkdulmAVoZsUGfqzh/9B841gLoI1VmCfPk4VDCvN4e3OGEdjYjVXng/rutILgMDktFHn31/Z584/R550GSNSXdn074kc1rzAnagjpQWQdgyufPtXoUVEjqrOLXJ1Oy8Gt5g9v7M6xGAWuD59zR6wl990y8RrWi1fPmhsncLTsXGuphBkNTehqEwuE+1Va4rvjIyqe69UZ8lumnb6pY9Gs0H2PpD7IKFltgbp/kTwtDjMRCwxkh948LQBwIJ63mxnSw1ljlnLgktYPvb2rcMsnSY5LYOebn1jUD7w98yOvK1vBI4JMLwgUoyljydPsncH5rVn9Mn3dj1qJN5fWmqJ7gq1IVvHlwsuw8ISXxRQcMEhqy5Raj57/fZGhdmrp2Dj8mAQlEXO6AVeIT0h6eg0+P5jPX+Oj12Mha2RQcDkCHs08N5ENTJYVYtaf5F39QpNrSlQQN7ZrxFtBjEvZMYbh5m11XSr3Ns0VBMvZxZ/BzTgTj1PJZK1pcs7hGEe8YS9qiD0fhZFXcD9P7NOVXxPev5IR+U6lP35BVC9qeFoY0likOTd5Qw==
+              datamoveruser: AgClEEDLNOjOSHk3G8FBC5ssD4tJs4AnJTZ46cCjImiRWyUY2tg+IcnzLNAHuDhCIlSxwoL+Kpc3nGPU91y8Iey/SeGCPo/2oMbmUOVTHyVb9x0uGvnOl/OZb9h6KIU/81mm4R7o4OoHQWdkPxtreXlrYmQYJaPrKNq26DmboQfTaeu4NrT/6i1MpmbfMjurIz/KIbTSStC/3PmliNwUbzWwyNDKN+ZxaiN2Q9R6UayRS6/7CEkxb/diB13zONmyHLVo7ca5vGznU2RRY4b9tRiaEnAG8OIw/uyHqz6aBfEhmbSQe53Ay5L+85Ins/5mDeKWnQwkm8t3u7CL9wcXDmOZBfdVvFrAUwntaCq3RFc/TXOtVv7aozwBRL0/pqD/c7yOXWBvIxZbLEGUZ+9rjfIS2WtWMSo8gypWHr9ro+TM/Ri3OoY01QGdY3F1Dohbry6JiXd9qbABWUMgJjJQNOYgFVys2a73UO+odprnIYtEHQIreXpdIc/S0Ic8qMl2ejJfV2QR0WyazVb6koI6cwKehoMTl3w3wVQzRNqFp3WqG3s24UW+MRBXbxHOqrtyR7Js2ZqlDJlWO4DcCbeSxweXS1Yc/+oj0FizCWDTcs1gn9ysXIDFnzMw5SKHFOoUbnJl4XQjuiLxvhll/r79rVn8yyPi7TbvA4O8j/btkJRC3dxgPbc0YIygkOLtamW8SO5bAumb+MXd+g==
+              miniopassword: AgChiGNTO9EpYA87lbWZE1PESE8DPx3vrNi20Xqb51prho0WQUdSuNYYtx2v1zjE63Z3klWVD01jaxavdbCnTZ4qDOISLUX8LRN19+9fT5gaS5lsglgUAVGk+pDzm6UjifhXe/JVrCeqLq5c4Nwstm5qjjHMMgdp1/dly5FxV2lLg0z6Kbwakii8rYigEYZZ6f2evDodSVhP+GvSR0l3QghLYFnsw6vzGfV13Sqvc3ebDRqmVl/DTqT5hJ7Ng2+Qa+yKvVkrFySb2Zqe9Nl/4duyRb1lEyu7tUYwILzP8x1NU9du5eMfFTZdwqir7OINJoseYGTQntwCGHh5h/sO7bi5xaHYhHQZmYLECy+7KHUXCbgHegu5Vf7q8rJxYzAS/z7j+cMNL06vQlzn9Pe5ngv7Mp8v51CqGPN03W3sVmlmBv/4FFnDQ9wu6ydIrKKkUBeB1Q+seNUUR5Ootoc5FECEzJxQRnCeiukBmx5xUYVSGMUVQ7lpiiqOoNHOuRXKFoq7XgYwPL2QBWsTF0BwY2V09ow2gTIEa5jIFqyWjlBCZbxl1o3Cqn61N8lxeBCFuZRlSqVzLggsTwuTh+gMA522HPJkIJl9dhOhfc9OZD3oetkcajRBHblU7uKG/hKPhh8kEixxxCGjKe7XErvBzCyRxntiumlJh7QCPe51IyumGgha1RRJPQAsgCET02kO2ZGCeHIl+h4Dsw==
+              miniouser: AgB1H6dLhbR5piqZbnymkRPG8ymUTSeOrFU4I+YzO/5vqhk3420K+pcfg+wSa8DMgT7TeGhtU+K9KPIPXRs7MhioxNAz6HCXyXy3vUit/wuQIYAwGiQ+7ZVTziRVm1swSlgSQjDk+tZ6s1LePXbUw0KX+VpChOLwUzuYq59XnFWGDXON4bR1iYCOxRw9EVz2LBRsw6f0CpzN3S/o4vGG+Kan6RWqpBq3O7Fi7IsZXmwxlB7AZqJKFr7i+92cVGxd91XJQe74s/Zw4i0X+XaY+oMGvWEHmF/o0A4Hppffk4k6ixel8QJu311tskKmQGtDRjpoENFGusFSXeHF9Imhp9IZUMon/c1hQLnnPdMVdzXWTYsccDQ6YRLF4oU9/8gvn2St3yqP/67HnRZj/TDGsdmjxfREePn0POe6j+ObKXzEoDY2dmUHDugTJdEyRIpug3Q9+c+FSPAMuhTEuN0SmPoHulEwUSrzKbzTwvpVL1gIvEsaQApcFuM8DTKHDRqCf/o0fll/xmjttuWdFY7YqR6K/WiU5IiH84fmW4cZf9UVWT7yofNCDQQJqcfgyjEzaX6Q4o4QcLWemg7y1uw5qN+7fEdG1Bfivkw7p5+Me6I87yuj7QhoUSqe5/W4Og0aNHaOKyz8NYuhYNstwfSLn5e18R4llJ7fuOMyBqOjKFsplyan1niQDCWruHECJbW2M+F3/ECGE0kNYA==
+          baasregistrysecret:
+            data:
+              .dockerconfigjson: AgBjia1pU/M7/T5G009edMNBDQ2dKceIBmGFpLlZb6W3yxzABfHL8Fl38na7gDxCRjg/hD6nYxmFWFdkJiIO3l3dvFvWp343bKSjfTyzREiIor/2AVefe/aVmw4qnR8oeOavA+5HwpgxucwknwR7NR6T1oqPIxaHVxf4uiHhedeOIROUVG279Fa738FTtk+3NcB5P8uwh0ZgRZBWZJktdAY+gIZ3zGC0/IRgrrJ4C1mhbAmHa71cKZ6zTVaW3mjxUUwnQSB2gxrALBpYwOhXMQ9dd3XS/CuoYjbSFp2QsT4tvRIlr3wGAHcycA880fkne1bK5MHSa1QSFTXKLPINI+685mEuwDHuxg/A2j/CNSB/RqCNZbEUMUUd1qzFTPmC2opTX/MwfGGVANoVSrZyX232+B09Y3X5uKSVXL9UTcjKOfmMnQ8pFKtMMGLBqoEwbMy2WYCH3T+YUHGlET5tTmloNQMWQfgjLDj6TC7bgNgFaPEBK/Dl6OljcThmyUIskEVctwRSHiFLsnOyq+rrqqNb8uYl7IPmrPybaHLm8AMbAX30eRp9lk6pUu/2x5KLtpQSmrHq43LqnZLFCp3LfWO4a11Mjh1/hbU2xzoxOMdxOtU3RN+9zX1RNvytG+CsWenLkvqfe7aZtg1RQvMdYE3mhOWtDSmlleOtxgU9xwg9M6YDE6oFn9j4VfKnym6I7phoj4q4zgMvqhohHLJa9C3SLIF7mcgdZTfxJDW98zqctCSLj7k6UqVuxV8FEmrrv+nuR9YhjkDB5hjm5U2X+ZTyMQuN2i8VJZAVml6XAaNTNhpqAhGgzYZgnm+lsVVdifQ3jeq6ax5plEpxqWLAm9oLf3SBhIuO6PFbF/fsz19Sq3PKjqF0y41m6PB9RRORAKRAw0asTC3JOqAcLA67mro+h7hKvR85kjosUymQ5bqzFo4p5XJ6kH8nySQH3gxZx79PQI+azCQ8WXi5H2/rUiJM+1RUK4wsADPQWK+h6GZzBNlHWrA2ew4G1Y9f52Hn5zUkaixl7VNYYhEx0lTHxTR0hJtv3myHKiFD8TFYoh9j4bDDk47fgoX+HNn6fGniZK1RiJxL2mh7b+9GsrEptP0XeGn/zYxkxQkSnlgH60ZxlGcL9V82bK8j+RKsFBuN7d/UtaolGPakVMk3zg9SxjcPr6fOoE8GYP+JbP0FIIl4K5bw5KojhGr5b1Gcw2PMYA8P22CArmXwKCqiEDpUn0PV8QCkzdKkWcVy6OiVTlYJSGeBD/g9V3PB38AK819Jtrw7Z5UnPaSI/i3fAmlZG2FS7pESbu4aoo/gwlEONtIzKvVemOx/n04KVzhoT+nF2FxqjLSl7n/LJ903RUWAkpG5pXh/TjqI3Kml7vFSvA==
+        ibm-spectrum-protect-plus-prod:
+          license: true
+          isOCP: true
+          clusterName: vbudi-spp-test-001
+          networkPolicy:
+            clusterAPIServerips:
+              - 10.17.41.246
+              - 10.17.44.178
+              - 10.17.44.246
+            clusterAPIServerport: 6443
+            clusterCIDR: 10.254.0.0/16
+            isServerInstalledOnAnotherCluster: false
+          SPPfqdn: ibmspp.apps.vbudi-spp-test-001.cp.fyre.ibm.com
+          SPPips: 9.30.234.244
+          SPPport: 443
+          productLoglevel: INFO
+          imageRegistry: cp.icr.io/cp
+          imageRegistryNamespace: sppc
+          minioStorageClass: ocs-storagecluster-cephfs
+          veleroNamespace: spp-velero
+          tm:
+            replicas: 3
diff --git a/...-cicd-dev-stage-prod/2-services/argocd/instances/ibm-apic-gateway-analytics-instance.yaml b/...-cicd-dev-stage-prod/2-services/argocd/instances/ibm-apic-gateway-analytics-instance.yaml
@@ -0,0 +1,20 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: ibm-apic-gateway-analytics-instance
+  annotations:
+    argocd.argoproj.io/sync-wave: "240"
+  labels:
+    gitops.tier.group: cloudpak
+    gitops.tier.layer: applications
+  spec:
+  destination:
+    namespace: openshift-gitops
+    server: https://kubernetes.default.svc
+  project: services
+  source: # repoURL  and targetRevision populated by kustomize patches in 2-services/kustomization.yaml
+    path: apic/config/argocd/single-cluster/instances/gateway-analytics-instance
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/...-cicd-dev-stage-prod/2-services/argocd/instances/ibm-apic-management-portal-instance.yaml b/...-cicd-dev-stage-prod/2-services/argocd/instances/ibm-apic-management-portal-instance.yaml
@@ -0,0 +1,20 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: ibm-apic-management-portal-instance
+  annotations:
+    argocd.argoproj.io/sync-wave: "240"
+  labels:
+    gitops.tier.group: cloudpak
+    gitops.tier.layer: applications
+spec:
+  destination:
+    namespace: openshift-gitops
+    server: https://kubernetes.default.svc
+  project: services
+  source: # repoURL  and targetRevision populated by kustomize patches in 2-services/kustomization.yaml
+    path: apic/config/argocd/single-cluster/instances/management-portal-instance
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/...ared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/oadp-instance.yaml b/...ared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/oadp-instance.yaml
@@ -0,0 +1,39 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: oadp-instance
+  annotations:
+    argocd.argoproj.io/sync-wave: "220"
+  labels:
+    gitops.tier.group: spp
+    gitops.tier.layer: services
+spec:
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+  destination:
+    namespace: spp-velero
+    server: https://kubernetes.default.svc
+  project: services
+  source:
+    path: instances/oadp-instance
+    helm:
+      values: |
+        oadp-instance:
+          oadp:
+            name: oadp-velero
+            spec:
+              default_velero_plugins:
+                - aws
+                - openshift
+              enable_restic: false
+              olm_managed: true
+              use_upstream_images: false
+              velero_resource_allocation:
+                limits:
+                  cpu: '1'
+                  memory: 512Mi
+                requests:
+                  cpu: 500m
+                  memory: 256Mi