diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk index f656b7db58..3bcba5399d 100644 --- a/Makefile.d/k8s.mk +++ b/Makefile.d/k8s.mk @@ -20,9 +20,7 @@ k8s/manifest/clean: k8s/agent \ k8s/discoverer \ k8s/gateway \ - k8s/manager \ - k8s/meta \ - k8s/jobs + k8s/manager .PHONY: k8s/manifest/update ## update k8s manifests using helm templates @@ -38,7 +36,6 @@ k8s/manifest/update: \ mv $(TEMP_DIR)/vald/templates/discoverer k8s/discoverer mv $(TEMP_DIR)/vald/templates/gateway/lb k8s/gateway/lb mv $(TEMP_DIR)/vald/templates/manager/index k8s/manager/index - mv $(TEMP_DIR)/vald/templates/jobs k8s/jobs rm -rf $(TEMP_DIR) .PHONY: k8s/manifest/helm-operator/clean diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml index 4baac4321a..ec8b29a2eb 100644 --- a/charts/vald/values.yaml +++ b/charts/vald/values.yaml @@ -1128,12 +1128,12 @@ gateway: - type: wait-for name: wait-for-discoverer target: discoverer - image: busybox + image: busybox:stable sleepDuration: 2 - type: wait-for name: wait-for-agent target: agent - image: busybox + image: busybox:stable sleepDuration: 2 # @schema {"name": "gateway.lb.env", "type": "array", "items": {"type": "object"}, "anchor": "env"} # gateway.lb.env -- environment variables @@ -1397,7 +1397,7 @@ gateway: - type: wait-for name: wait-for-gateway-lb target: gateway-lb - image: busybox + image: busybox:stable sleepDuration: 2 # @schema {"name": "gateway.filter.env", "type": "array", "items": {"type": "object"}, "anchor": "env"} # gateway.filter.env -- environment variables @@ -2618,12 +2618,12 @@ manager: - type: wait-for name: wait-for-agent target: agent - image: busybox + image: busybox:stable sleepDuration: 2 - type: wait-for name: wait-for-discoverer target: discoverer - image: busybox + image: busybox:stable sleepDuration: 2 # @schema {"name": "manager.index.env", "alias": "env"} # manager.index.env -- environment variables diff --git a/k8s/agent/configmap.yaml b/k8s/agent/configmap.yaml index bb761d90a4..9e2e68117f 100644 --- a/k8s/agent/configmap.yaml +++ b/k8s/agent/configmap.yaml @@ -20,10 +20,10 @@ metadata: name: vald-agent-ngt-config labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: agent data: config.yaml: | diff --git a/k8s/agent/pdb.yaml b/k8s/agent/pdb.yaml index 40a2dbddad..270034c061 100644 --- a/k8s/agent/pdb.yaml +++ b/k8s/agent/pdb.yaml @@ -20,10 +20,10 @@ metadata: name: vald-agent-ngt labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: agent spec: maxUnavailable: 1 diff --git a/k8s/agent/priorityclass.yaml b/k8s/agent/priorityclass.yaml index 098d1a4d9e..9e203bba34 100644 --- a/k8s/agent/priorityclass.yaml +++ b/k8s/agent/priorityclass.yaml @@ -20,10 +20,10 @@ metadata: name: default-vald-agent-ngt-priority labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: agent value: 1e+09 preemptionPolicy: Never diff --git a/k8s/agent/statefulset.yaml b/k8s/agent/statefulset.yaml index 7815e5fcc5..9a41b3db1f 100644 --- a/k8s/agent/statefulset.yaml +++ b/k8s/agent/statefulset.yaml @@ -21,10 +21,10 @@ metadata: labels: app: vald-agent-ngt app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: agent spec: serviceName: vald-agent-ngt diff --git a/k8s/agent/svc.yaml b/k8s/agent/svc.yaml index ae0394240a..fa5c18c734 100644 --- a/k8s/agent/svc.yaml +++ b/k8s/agent/svc.yaml @@ -20,10 +20,10 @@ metadata: name: vald-agent-ngt labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: agent spec: ports: diff --git a/k8s/discoverer/clusterrole.yaml b/k8s/discoverer/clusterrole.yaml index 10b05fece7..411a77c0f2 100644 --- a/k8s/discoverer/clusterrole.yaml +++ b/k8s/discoverer/clusterrole.yaml @@ -20,10 +20,10 @@ metadata: name: discoverer labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer rules: - apiGroups: diff --git a/k8s/discoverer/clusterrolebinding.yaml b/k8s/discoverer/clusterrolebinding.yaml index aa3a1abf2b..49b95d165b 100644 --- a/k8s/discoverer/clusterrolebinding.yaml +++ b/k8s/discoverer/clusterrolebinding.yaml @@ -20,10 +20,10 @@ metadata: name: discoverer labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/k8s/discoverer/configmap.yaml b/k8s/discoverer/configmap.yaml index 1a514acc5b..89e4b27233 100644 --- a/k8s/discoverer/configmap.yaml +++ b/k8s/discoverer/configmap.yaml @@ -20,10 +20,10 @@ metadata: name: vald-discoverer-config labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer data: config.yaml: | diff --git a/k8s/discoverer/deployment.yaml b/k8s/discoverer/deployment.yaml index 5d3ae04672..02e15eb5c3 100644 --- a/k8s/discoverer/deployment.yaml +++ b/k8s/discoverer/deployment.yaml @@ -21,10 +21,10 @@ metadata: labels: app: vald-discoverer app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer spec: progressDeadlineSeconds: 600 @@ -47,7 +47,7 @@ spec: app.kubernetes.io/instance: release-name app.kubernetes.io/component: discoverer annotations: - checksum/configmap: 125953282a5f41c3b214872e2ec2e1a5c0427303679810c77a7f4abf44136323 + checksum/configmap: 70be059b6cae4bddf3437e76777c040bbbba06ea4e02626fc27dfce7c22a9e1e profefe.com/enable: "true" profefe.com/port: "6060" profefe.com/service: vald-discoverer diff --git a/k8s/discoverer/pdb.yaml b/k8s/discoverer/pdb.yaml index 902bf1c145..54ccb77424 100644 --- a/k8s/discoverer/pdb.yaml +++ b/k8s/discoverer/pdb.yaml @@ -20,10 +20,10 @@ metadata: name: vald-discoverer labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer spec: maxUnavailable: 50% diff --git a/k8s/discoverer/priorityclass.yaml b/k8s/discoverer/priorityclass.yaml index 6b03defe64..54ed439139 100644 --- a/k8s/discoverer/priorityclass.yaml +++ b/k8s/discoverer/priorityclass.yaml @@ -20,10 +20,10 @@ metadata: name: default-vald-discoverer-priority labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer value: 1e+06 globalDefault: false diff --git a/k8s/discoverer/serviceaccount.yaml b/k8s/discoverer/serviceaccount.yaml index 07d5961e43..ffee3a954f 100644 --- a/k8s/discoverer/serviceaccount.yaml +++ b/k8s/discoverer/serviceaccount.yaml @@ -20,8 +20,8 @@ metadata: name: vald labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer diff --git a/k8s/discoverer/svc.yaml b/k8s/discoverer/svc.yaml index dfef85b7aa..c09274a593 100644 --- a/k8s/discoverer/svc.yaml +++ b/k8s/discoverer/svc.yaml @@ -20,10 +20,10 @@ metadata: name: vald-discoverer labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: discoverer spec: ports: diff --git a/k8s/gateway/lb/configmap.yaml b/k8s/gateway/lb/configmap.yaml index 5b1adea58c..558332bdbb 100644 --- a/k8s/gateway/lb/configmap.yaml +++ b/k8s/gateway/lb/configmap.yaml @@ -20,10 +20,10 @@ metadata: name: vald-lb-gateway-config labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb data: config.yaml: | diff --git a/k8s/gateway/lb/deployment.yaml b/k8s/gateway/lb/deployment.yaml index abf03f80f3..9a5a005693 100644 --- a/k8s/gateway/lb/deployment.yaml +++ b/k8s/gateway/lb/deployment.yaml @@ -21,10 +21,10 @@ metadata: labels: app: vald-lb-gateway app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb spec: progressDeadlineSeconds: 600 @@ -46,7 +46,7 @@ spec: app.kubernetes.io/instance: release-name app.kubernetes.io/component: gateway-lb annotations: - checksum/configmap: c6eb703267a60372ef31ce3146749fb33806a882266cb89fe3d399013c1d83ed + checksum/configmap: 1653d65259a3b79353da5f550b33417bc0df99ea11a233575c20ffaf43af8955 profefe.com/enable: "true" profefe.com/port: "6060" profefe.com/service: vald-lb-gateway @@ -58,7 +58,7 @@ spec: spec: initContainers: - name: wait-for-discoverer - image: busybox + image: busybox:stable command: - /bin/sh - -e @@ -69,7 +69,7 @@ spec: sleep 2; done - name: wait-for-agent - image: busybox + image: busybox:stable command: - /bin/sh - -e diff --git a/k8s/gateway/lb/hpa.yaml b/k8s/gateway/lb/hpa.yaml index 779c2219de..64c2a78f3b 100644 --- a/k8s/gateway/lb/hpa.yaml +++ b/k8s/gateway/lb/hpa.yaml @@ -20,10 +20,10 @@ metadata: name: vald-lb-gateway labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb spec: maxReplicas: 9 diff --git a/k8s/gateway/lb/pdb.yaml b/k8s/gateway/lb/pdb.yaml index 9969d518df..c467a69780 100644 --- a/k8s/gateway/lb/pdb.yaml +++ b/k8s/gateway/lb/pdb.yaml @@ -20,10 +20,10 @@ metadata: name: vald-lb-gateway labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb spec: maxUnavailable: 50% diff --git a/k8s/gateway/lb/priorityclass.yaml b/k8s/gateway/lb/priorityclass.yaml index 6af4e05518..a3b8d4ad85 100644 --- a/k8s/gateway/lb/priorityclass.yaml +++ b/k8s/gateway/lb/priorityclass.yaml @@ -20,10 +20,10 @@ metadata: name: default-vald-lb-gateway-priority labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb value: 1e+06 globalDefault: false diff --git a/k8s/gateway/lb/svc.yaml b/k8s/gateway/lb/svc.yaml index 839e33992a..49b1ebf37d 100644 --- a/k8s/gateway/lb/svc.yaml +++ b/k8s/gateway/lb/svc.yaml @@ -20,10 +20,10 @@ metadata: name: vald-lb-gateway labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: gateway-lb spec: ports: diff --git a/k8s/manager/index/configmap.yaml b/k8s/manager/index/configmap.yaml index 8af9112518..17fed0575e 100644 --- a/k8s/manager/index/configmap.yaml +++ b/k8s/manager/index/configmap.yaml @@ -20,10 +20,10 @@ metadata: name: vald-manager-index-config labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: manager-index data: config.yaml: | diff --git a/k8s/manager/index/deployment.yaml b/k8s/manager/index/deployment.yaml index fd76ead2ef..1cebef8472 100644 --- a/k8s/manager/index/deployment.yaml +++ b/k8s/manager/index/deployment.yaml @@ -21,10 +21,10 @@ metadata: labels: app: vald-manager-index app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: manager-index spec: progressDeadlineSeconds: 600 @@ -47,7 +47,7 @@ spec: app.kubernetes.io/instance: release-name app.kubernetes.io/component: manager-index annotations: - checksum/configmap: 787f0b29f85d4275a26a5fbd46f1c1115938ceccf767e7c45d75ca948e3af41b + checksum/configmap: 53707760028758074a8b9833a8a20f161d3f0d7e7db2c9ba33b7e28a08773e83 profefe.com/enable: "true" profefe.com/port: "6060" profefe.com/service: vald-manager-index @@ -59,7 +59,7 @@ spec: spec: initContainers: - name: wait-for-agent - image: busybox + image: busybox:stable command: - /bin/sh - -e @@ -70,7 +70,7 @@ spec: sleep 2; done - name: wait-for-discoverer - image: busybox + image: busybox:stable command: - /bin/sh - -e diff --git a/k8s/manager/index/pdb.yaml b/k8s/manager/index/pdb.yaml index eb5ff1db2f..7d32a6ce33 100644 --- a/k8s/manager/index/pdb.yaml +++ b/k8s/manager/index/pdb.yaml @@ -20,10 +20,10 @@ metadata: name: vald-manager-index labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: manager-index spec: maxUnavailable: 50% diff --git a/k8s/manager/index/priorityclass.yaml b/k8s/manager/index/priorityclass.yaml index 8994e9e7d0..f200386da7 100644 --- a/k8s/manager/index/priorityclass.yaml +++ b/k8s/manager/index/priorityclass.yaml @@ -20,10 +20,10 @@ metadata: name: default-vald-manager-index-priority labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: manager-index value: 1e+06 globalDefault: false diff --git a/k8s/manager/index/svc.yaml b/k8s/manager/index/svc.yaml index 84dc23a41d..87f18d3fe5 100644 --- a/k8s/manager/index/svc.yaml +++ b/k8s/manager/index/svc.yaml @@ -20,10 +20,10 @@ metadata: name: vald-manager-index labels: app.kubernetes.io/name: vald - helm.sh/chart: vald-v1.5.1 + helm.sh/chart: vald-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: manager-index spec: ports: diff --git a/k8s/operator/helm/operator.yaml b/k8s/operator/helm/operator.yaml index 67f788fed2..8a889f3fb7 100644 --- a/k8s/operator/helm/operator.yaml +++ b/k8s/operator/helm/operator.yaml @@ -22,10 +22,10 @@ metadata: labels: app: vald-helm-operator app.kubernetes.io/name: vald-helm-operator - helm.sh/chart: vald-helm-operator-v1.5.1 + helm.sh/chart: vald-helm-operator-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: helm-operator spec: replicas: 2 @@ -43,7 +43,7 @@ spec: serviceAccountName: vald-helm-operator containers: - name: vald-helm-operator - image: "vdaas/vald-helm-operator:v1.5.1" + image: "vdaas/vald-helm-operator:v1.5.2" imagePullPolicy: Always args: - "run" diff --git a/k8s/operator/helm/svc.yaml b/k8s/operator/helm/svc.yaml index 550ab3385b..9e1f24309d 100644 --- a/k8s/operator/helm/svc.yaml +++ b/k8s/operator/helm/svc.yaml @@ -20,10 +20,10 @@ metadata: name: vald-helm-operator labels: app.kubernetes.io/name: vald-helm-operator - helm.sh/chart: vald-helm-operator-v1.5.1 + helm.sh/chart: vald-helm-operator-v1.5.2 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.5.1 + app.kubernetes.io/version: v1.5.2 app.kubernetes.io/component: helm-operator spec: ports: