Add configurable support for armada-operator
Signed-off-by: Ruslan Aliev <raliev@mirantis.com> Change-Id: I22cf48839ccfd62a6ed293080fd8b90a2f31a5f9
This commit is contained in:
parent
a20e00e485
commit
29405cec00
@ -45,6 +45,7 @@ data:
|
|||||||
run_as_user: 65534
|
run_as_user: 65534
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
||||||
|
armada-operator: quay.io/raliev12/armada-controller:latest
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
||||||
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
||||||
|
@ -34,6 +34,7 @@ data:
|
|||||||
run_as_user: 65534
|
run_as_user: 65534
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
||||||
|
armada-operator: quay.io/raliev12/armada-controller:latest
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
||||||
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
||||||
|
@ -149,11 +149,16 @@ data:
|
|||||||
$ref: '#/definitions/kubernetes_label'
|
$ref: '#/definitions/kubernetes_label'
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
|
||||||
|
enable_operator:
|
||||||
|
type: boolean
|
||||||
|
|
||||||
images:
|
images:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
armada:
|
armada:
|
||||||
$ref: '#/definitions/image'
|
$ref: '#/definitions/image'
|
||||||
|
armada-operator:
|
||||||
|
$ref: '#/definitions/image'
|
||||||
kubernetes:
|
kubernetes:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
@ -68,6 +68,37 @@ spec:
|
|||||||
mountPath: /tmp/log
|
mountPath: /tmp/log
|
||||||
- name: metrics
|
- name: metrics
|
||||||
mountPath: /tmp/metrics
|
mountPath: /tmp/metrics
|
||||||
|
{%- if config['Genesis:enable_operator'] is sameas true %}
|
||||||
|
- 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
|
||||||
|
{%- endif %}
|
||||||
- name: monitor
|
- name: monitor
|
||||||
image: {{ config['HostSystem:images.monitoring_image'] }}
|
image: {{ config['HostSystem:images.monitoring_image'] }}
|
||||||
command:
|
command:
|
||||||
|
@ -31,11 +31,13 @@ data:
|
|||||||
- ucp-control-plane=enabled
|
- ucp-control-plane=enabled
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
armada: quay.io/airshipit/armada:latest-ubuntu_focal
|
||||||
|
armada-operator: quay.io/raliev12/armada-controller:latest
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
|
||||||
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
|
||||||
etcd: quay.io/coreos/etcd:v3.5.6
|
etcd: quay.io/coreos/etcd:v3.5.6
|
||||||
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
|
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
|
||||||
|
enable_operator: false
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: "# placeholder for triggering calico etcd bootstrapping"
|
content: "# placeholder for triggering calico etcd bootstrapping"
|
||||||
|
@ -36,6 +36,7 @@ data:
|
|||||||
controller-manager: ${IMAGE_CONTROLLER_MANAGER}
|
controller-manager: ${IMAGE_CONTROLLER_MANAGER}
|
||||||
etcd: ${IMAGE_ETCD}
|
etcd: ${IMAGE_ETCD}
|
||||||
scheduler: ${IMAGE_SCHEDULER}
|
scheduler: ${IMAGE_SCHEDULER}
|
||||||
|
enable_operator: false
|
||||||
files:
|
files:
|
||||||
- path: /var/lib/anchor/calico-etcd-bootstrap
|
- path: /var/lib/anchor/calico-etcd-bootstrap
|
||||||
content: ""
|
content: ""
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
IMAGE_ARMADA=quay.io/airshipit/armada:latest-ubuntu_focal
|
IMAGE_ARMADA=quay.io/airshipit/armada:latest-ubuntu_focal
|
||||||
|
IMAGE_ARMADA_OPERATOR=quay.io/raliev12/armada-controller:latest
|
||||||
IMAGE_CALICO_CNI=quay.io/calico/cni:v3.4.0
|
IMAGE_CALICO_CNI=quay.io/calico/cni:v3.4.0
|
||||||
IMAGE_CALICO_CTL=quay.io/calico/ctl:v3.4.0
|
IMAGE_CALICO_CTL=quay.io/calico/ctl:v3.4.0
|
||||||
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0
|
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0
|
||||||
|
@ -7,6 +7,7 @@ registry.k8s.io/kube-scheduler-amd64,v1.27.4,scheduler
|
|||||||
registry.k8s.io/kube-proxy-amd64,v1.27.4,proxy
|
registry.k8s.io/kube-proxy-amd64,v1.27.4,proxy
|
||||||
lachlanevenson/k8s-helm,v3.12.2,helm
|
lachlanevenson/k8s-helm,v3.12.2,helm
|
||||||
quay.io/airshipit/armada,master,armada
|
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/cni,v3.4.0,calico-cni
|
||||||
quay.io/calico/ctl,v3.4.0,calico-ctl
|
quay.io/calico/ctl,v3.4.0,calico-ctl
|
||||||
quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers
|
quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers
|
||||||
|
Loading…
Reference in New Issue
Block a user