Skip to content

Commit

Permalink
update manifests version (#1642)
Browse files Browse the repository at this point in the history
* update manifests version

Signed-off-by: kpango <kpango@vdaas.org>

* fix

Signed-off-by: kpango <kpango@vdaas.org>
  • Loading branch information
kpango authored Apr 26, 2022
1 parent f0f05f9 commit 499e2f0
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 69 deletions.
5 changes: 1 addition & 4 deletions Makefile.d/k8s.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions charts/vald/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/agent/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions k8s/agent/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/agent/priorityclass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/agent/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/agent/svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions k8s/discoverer/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/priorityclass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/discoverer/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions k8s/discoverer/svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions k8s/gateway/lb/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions k8s/gateway/lb/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -58,7 +58,7 @@ spec:
spec:
initContainers:
- name: wait-for-discoverer
image: busybox
image: busybox:stable
command:
- /bin/sh
- -e
Expand All @@ -69,7 +69,7 @@ spec:
sleep 2;
done
- name: wait-for-agent
image: busybox
image: busybox:stable
command:
- /bin/sh
- -e
Expand Down
4 changes: 2 additions & 2 deletions k8s/gateway/lb/hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/gateway/lb/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
4 changes: 2 additions & 2 deletions k8s/gateway/lb/priorityclass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/gateway/lb/svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions k8s/manager/index/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions k8s/manager/index/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -59,7 +59,7 @@ spec:
spec:
initContainers:
- name: wait-for-agent
image: busybox
image: busybox:stable
command:
- /bin/sh
- -e
Expand All @@ -70,7 +70,7 @@ spec:
sleep 2;
done
- name: wait-for-discoverer
image: busybox
image: busybox:stable
command:
- /bin/sh
- -e
Expand Down
Loading

0 comments on commit 499e2f0

Please sign in to comment.