Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix update-k8s workflow & update sample manifests #567

Merged
merged 2 commits into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ jobs:
- name: Helm version
run: |
helm version
- name: Update k8s-dir
- name: switch new branch
id: switch_to_new_branch
run: |
TIMESTAMP=$(date +%Y%m%d_%H%M%S_%3N)
BRANCH_NAME="documentation/k8s-manifests/update_k8s_manifests_${TIMESTAMP}"
git checkout master
git checkout -b ${BRANCH_NAME}

echo "::set-output name=BRANCH_NAME::${BRANCH_NAME}"
- name: Update k8s-dir
run: |
make k8s/manifest/update
make k8s/manifest/helm-operator/update
- name: Run formatter and license.go
Expand Down Expand Up @@ -68,6 +71,7 @@ jobs:
GITHUB_USER: ${{ secrets.DISPATCH_USER }}
GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }}
API_URL: https://api.github.com/repos/vdaas/vald/pulls
BRANCH_NAME: ${{ steps.switch_to_new_branch.outputs.BRANCH_NAME }}
update-helm-chart:
name: Update Helm chart
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ addrs:
{{- else if .default.addrs }}
addrs:
{{- toYaml .default.addrs | nindent 2 }}
{{- else }}
{{- else -}}
addrs: []
{{- end }}
health_check_duration: {{ default .default.health_check_duration .Values.health_check_duration | quote }}
Expand Down
65 changes: 57 additions & 8 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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: agent
data:
config.yaml: |
Expand Down Expand Up @@ -105,6 +105,15 @@ data:
enable_goroutine: true
enable_memory: true
enable_version_info: true
version_info_labels:
- vald_version
- server_name
- git_commit
- build_time
- go_version
- go_os
- go_arch
- ngt_version
trace:
enabled: false
sampling_rate: 1
Expand All @@ -113,13 +122,53 @@ data:
endpoint: /metrics
namespace: vald
jaeger:
enabled: false
collector_endpoint: ""
agent_endpoint: "jaeger-agent.default.svc.cluster.local:6831"
username: ""
password: ""
service_name: "vald-agent-ngt"
buffer_max_count: 10
stackdriver:
project_id: ""
client:
api_key: ""
audiences: []
authentication_enabled: true
credentials_file: ""
credentials_json: ""
endpoint: ""
quota_project: ""
request_reason: ""
scopes: []
telemetry_enabled: true
user_agent: ""
exporter:
bundle_count_threshold: 0
bundle_delay_threshold: "0"
location: ""
metric_prefix: vald.vdaas.org
monitoring_enabled: false
number_of_workers: 1
reporting_interval: 1m
skip_cmd: false
timeout: 5s
trace_spans_buffer_max_bytes: 0
tracing_enabled: false
profiler:
enabled: false
collector_endpoint: ""
agent_endpoint: "jaeger-agent.default.svc.cluster.local:6831"
username: ""
password: ""
service_name: "vald-agent-ngt"
buffer_max_count: 10
service: "vald-agent-ngt"
service_version: ""
debug_logging: false
mutex_profiling: true
cpu_profiling: true
alloc_profiling: true
heap_profiling: true
goroutine_profiling: true
alloc_force_gc: false
api_addr: ""
instance: ""
zone: ""
ngt:
auto_index_check_duration: 30m
auto_index_duration_limit: 24h
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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: vald-agent-ngt-priority
labels:
app.kubernetes.io/name: vald
helm.sh/chart: vald-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: agent
value: 1e+09
preemptionPolicy: Never
Expand Down
6 changes: 3 additions & 3 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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: agent
spec:
serviceName: vald-agent-ngt
Expand All @@ -51,7 +51,7 @@ spec:
profefe.com/port: "6060"
profefe.com/service: vald-agent-ngt
# annotations:
# checksum/configmap: d62feea39f02ad4ae36174e20bb277501cdc8bc45b2827accad869e14feeeb05
# checksum/configmap: 9cbb91724829ad1ebc5b9ae184053b9aa53684b7c33ee57d0b4e1c82a8b707fe
spec:
affinity:
nodeAffinity:
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: discoverer
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
65 changes: 57 additions & 8 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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: discoverer
data:
config.yaml: |
Expand Down Expand Up @@ -118,6 +118,15 @@ data:
enable_goroutine: true
enable_memory: true
enable_version_info: true
version_info_labels:
- vald_version
- server_name
- git_commit
- build_time
- go_version
- go_os
- go_arch
- ngt_version
trace:
enabled: false
sampling_rate: 1
Expand All @@ -126,13 +135,53 @@ data:
endpoint: /metrics
namespace: vald
jaeger:
enabled: false
collector_endpoint: ""
agent_endpoint: "jaeger-agent.default.svc.cluster.local:6831"
username: ""
password: ""
service_name: "vald-discoverer"
buffer_max_count: 10
stackdriver:
project_id: ""
client:
api_key: ""
audiences: []
authentication_enabled: true
credentials_file: ""
credentials_json: ""
endpoint: ""
quota_project: ""
request_reason: ""
scopes: []
telemetry_enabled: true
user_agent: ""
exporter:
bundle_count_threshold: 0
bundle_delay_threshold: "0"
location: ""
metric_prefix: vald.vdaas.org
monitoring_enabled: false
number_of_workers: 1
reporting_interval: 1m
skip_cmd: false
timeout: 5s
trace_spans_buffer_max_bytes: 0
tracing_enabled: false
profiler:
enabled: false
collector_endpoint: ""
agent_endpoint: "jaeger-agent.default.svc.cluster.local:6831"
username: ""
password: ""
service_name: "vald-discoverer"
buffer_max_count: 10
service: "vald-discoverer"
service_version: ""
debug_logging: false
mutex_profiling: true
cpu_profiling: true
alloc_profiling: true
heap_profiling: true
goroutine_profiling: true
alloc_force_gc: false
api_addr: ""
instance: ""
zone: ""
discoverer:
discovery_duration: 3s
name: ""
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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: 851cc01b6f6eff0464b759f05c3a1ca8694bfca34ebce0efa6193239db59ec5c
checksum/configmap: 288e9e1248a72543e36615dce44c311ddfbb4475514aa2a0de82848f14b1fc8f
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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: vald-discoverer-priority
labels:
app.kubernetes.io/name: vald
helm.sh/chart: vald-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
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-v0.0.37
helm.sh/chart: vald-v0.0.44
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/version: v0.0.37
app.kubernetes.io/version: v0.0.44
app.kubernetes.io/component: discoverer
spec:
ports:
Expand Down
Loading