From 1a54f100cd89f7e9ecfd1e54bb510f00ddbc9d48 Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Fri, 10 Nov 2023 02:54:53 -0600 Subject: [PATCH] [DNM] Operator embed Signed-off-by: Ruslan Aliev Change-Id: I22cf48839ccfd62a6ed293080fd8b90a2f31a5f9 --- examples/basic/Genesis.yaml | 1 + examples/complete/Genesis.yaml | 1 + promenade/schemas/Genesis.yaml | 2 ++ .../manifests/bootstrap-armada.yaml | 29 +++++++++++++++++++ tools/registry/IMAGES | 1 + 5 files changed, 34 insertions(+) diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 27160ecf..3f97c6a5 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -45,6 +45,7 @@ data: run_as_user: 65534 images: armada: quay.io/airshipit/armada:latest-ubuntu_focal + armada-operator: quay.io/raliev12/armada-controller:latest kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4 diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index de173e42..e5afc724 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -34,6 +34,7 @@ data: run_as_user: 65534 images: armada: quay.io/airshipit/armada:latest-ubuntu_focal + armada-operator: quay.io/raliev12/armada-controller:latest kubernetes: apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4 controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4 diff --git a/promenade/schemas/Genesis.yaml b/promenade/schemas/Genesis.yaml index a251a537..95d191c8 100644 --- a/promenade/schemas/Genesis.yaml +++ b/promenade/schemas/Genesis.yaml @@ -154,6 +154,8 @@ data: properties: armada: $ref: '#/definitions/image' + armada-operator: + $ref: '#/definitions/image' kubernetes: type: object properties: diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml index fdcece02..66781715 100644 --- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml +++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml @@ -68,6 +68,35 @@ spec: mountPath: /tmp/log - name: metrics mountPath: /tmp/metrics + - args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect + - --leader-elect-namespace=ucp + command: + - /manager + env: + - name: KUBECONFIG + value: /root/.kube/config + image: {{ config['Genesis:images.armada-operator'] }} + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + name: manager + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + securityContext: + runAsUser: 0 + volumeMounts: + - name: auth + mountPath: /root/.kube - name: monitor image: {{ config['HostSystem:images.monitoring_image'] }} command: diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index d0dacefd..26d72ede 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -7,6 +7,7 @@ registry.k8s.io/kube-scheduler-amd64,v1.27.4,scheduler registry.k8s.io/kube-proxy-amd64,v1.27.4,proxy lachlanevenson/k8s-helm,v3.12.2,helm quay.io/airshipit/armada,master,armada +quay.io/raliev12/armada-controller,latest,armada-operator quay.io/calico/cni,v3.4.0,calico-cni quay.io/calico/ctl,v3.4.0,calico-ctl quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers