Merge "Use apps/v1 k8s controllers and add labels"
This commit is contained in:
commit
e88cbafd62
@ -16,13 +16,14 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
|
{{- $labels := tuple $envAll "armada" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" -}}
|
||||||
{{- $mounts_armada_api := .Values.pod.mounts.armada_api.armada_api }}
|
{{- $mounts_armada_api := .Values.pod.mounts.armada_api.armada_api }}
|
||||||
{{- $mounts_armada_api_init := .Values.pod.mounts.armada_api.init_container }}
|
{{- $mounts_armada_api_init := .Values.pod.mounts.armada_api.init_container }}
|
||||||
{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.armada }}
|
{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.armada }}
|
||||||
{{- $serviceAccountName := "armada-api" }}
|
{{- $serviceAccountName := "armada-api" }}
|
||||||
{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: armada-api-runner
|
name: armada-api-runner
|
||||||
@ -40,7 +41,7 @@ rules:
|
|||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: run-armada-api
|
name: run-armada-api
|
||||||
@ -66,7 +67,7 @@ subjects:
|
|||||||
name: {{ $serviceAccountName }}
|
name: {{ $serviceAccountName }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: armada-api
|
name: armada-api
|
||||||
@ -74,11 +75,14 @@ metadata:
|
|||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
|
||||||
spec:
|
spec:
|
||||||
replicas: {{ .Values.pod.replicas.api }}
|
replicas: {{ .Values.pod.replicas.api }}
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
{{ $labels | indent 6 }}
|
||||||
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "armada" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
{{ $labels | indent 8 }}
|
||||||
annotations:
|
annotations:
|
||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
|
@ -19,7 +19,7 @@ limitations under the License.
|
|||||||
{{- $serviceAccountName := "tiller-deploy" }}
|
{{- $serviceAccountName := "tiller-deploy" }}
|
||||||
{{ tuple $envAll "tiller_deploy" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll "tiller_deploy" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: run-tiller
|
name: run-tiller
|
||||||
@ -32,7 +32,7 @@ subjects:
|
|||||||
name: {{ $serviceAccountName }}
|
name: {{ $serviceAccountName }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
Loading…
Reference in New Issue
Block a user