From 91ade23290e1eeb50030f58791f0469f7eec4de4 Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Fri, 22 May 2020 09:49:34 +0900 Subject: [PATCH 1/5] :arrow_up: upgrading helm, helm-docs, kind versions Signed-off-by: Rintaro Okamura --- Makefile | 8 ++++---- Makefile.d/helm.mk | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d0c2cf2cff..5e0869a4a0 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,10 @@ TENSORFLOW_C_VERSION := $(eval TENSORFLOW_C_VERSION := $(shell cat versions/TENS OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION) DOCKFMT_VERSION ?= v0.3.3 -KIND_VERSION ?= v0.7.0 -HELM_VERSION ?= v3.2.0 -HELM_DOCS_VERSION ?= 0.12.0 -VALDCLI_VERSION ?= v0.0.35 +KIND_VERSION ?= v0.8.1 +HELM_VERSION ?= v3.2.1 +HELM_DOCS_VERSION ?= 0.13.0 +VALDCLI_VERSION ?= v0.0.37 TELEPRESENCE_VERSION ?= 0.105 SWAP_DEPLOYMENT_TYPE ?= deployment diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk index b10e48b4b2..d937462086 100644 --- a/Makefile.d/helm.mk +++ b/Makefile.d/helm.mk @@ -60,6 +60,8 @@ helm/repo/add: .PHONY: helm/docs/vald helm/docs/vald: charts/vald/README.md +# force to rebuild +.PHONY: charts/vald/README.md charts/vald/README.md: \ charts/vald/README.md.gotmpl \ charts/vald/values.yaml @@ -68,6 +70,8 @@ charts/vald/README.md: \ .PHONY: helm/docs/vald-helm-operator helm/docs/vald-helm-operator: charts/vald-helm-operator/README.md +# force to rebuild +.PHONY: charts/vald-helm-operator/README.md charts/vald-helm-operator/README.md: \ charts/vald-helm-operator/README.md.gotmpl \ charts/vald-helm-operator/values.yaml From 4cc93dd3412c7db8b0bdc782a5b4a2799194383c Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Fri, 22 May 2020 10:09:23 +0900 Subject: [PATCH 2/5] :pencil: Fix docs Signed-off-by: Rintaro Okamura --- charts/vald/values.yaml | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml index 29996831a3..7baa83a083 100644 --- a/charts/vald/values.yaml +++ b/charts/vald/values.yaml @@ -19,13 +19,13 @@ defaults: # defaults.time_zone -- Time zone time_zone: UTC logging: - # defaults.logging.logger -- logger name + # defaults.logging.logger -- logger name. # currently logger must be `glg`. logger: glg - # defaults.logging.level -- logging level + # defaults.logging.level -- logging level. # logging level must be `debug`, `info`, `warn`, `error` or `fatal`. level: debug - # defaults.logging.format -- logging format + # defaults.logging.format -- logging format. # logging format must be `raw` or `json` format: raw image: @@ -369,7 +369,7 @@ defaults: # defaults.observability.enabled -- observability features enabled enabled: false collector: - # defaults.observability.collector.duration -- metrics collect duration + # defaults.observability.collector.duration -- metrics collect duration. # if it is set as 5s, enabled metrics are collected every 5 seconds. duration: 5s metrics: @@ -384,7 +384,7 @@ defaults: trace: # defaults.observability.trace.enabled -- trace enabled enabled: false - # defaults.observability.trace.sampling_rate -- trace sampling rate + # defaults.observability.trace.sampling_rate -- trace sampling rate. # must be between 0.0 to 1.0. sampling_rate: 1.0 prometheus: @@ -425,10 +425,10 @@ gateway: externalTrafficPolicy: "" # gateway.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # gateway.minReplicas -- minimum number of replicas + # gateway.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 3 - # gateway.maxReplicas -- maximum number of replicas + # gateway.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 9 # gateway.maxUnavailable -- maximum number of unavailable replicas @@ -620,10 +620,10 @@ agent: externalTrafficPolicy: "" # agent.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # agent.minReplicas -- minimum number of replicas + # agent.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 20 - # agent.maxReplicas -- maximum number of replicas + # agent.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 300 # agent.maxUnavailable -- maximum number of unavailable replicas @@ -735,7 +735,7 @@ agent: observability: jaeger: service_name: vald-agent-ngt - # agent.resources -- compute resources + # agent.resources -- compute resources. # recommended setting of memory requests = cluster memory * 0.4 / number of agent pods resources: requests: @@ -758,12 +758,12 @@ agent: dimension: 4096 # agent.ngt.bulk_insert_chunk_size -- bulk insert chunk size bulk_insert_chunk_size: 10 - # agent.ngt.distance_type -- distance type - # it should be `l1`, `l2`, `angle`, `hamming`, `cosine`, `normalizedangle` or `normalizedcosine` + # agent.ngt.distance_type -- distance type. + # it should be `l1`, `l2`, `angle`, `hamming`, `cosine`, `normalizedangle` or `normalizedcosine`. # for further details: https://github.com/yahoojapan/NGT/wiki/Command-Quick-Reference distance_type: l2 - # agent.ngt.object_type -- object type - # it should be `float` or `uint8` + # agent.ngt.object_type -- object type. + # it should be `float` or `uint8`. # for further details: https://github.com/yahoojapan/NGT/wiki/Command-Quick-Reference object_type: float # agent.ngt.creation_edge_size -- creation edge size @@ -788,10 +788,10 @@ discoverer: externalTrafficPolicy: "" # discoverer.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # discoverer.minReplicas -- minimum number of replicas + # discoverer.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 1 - # discoverer.maxReplicas -- maximum number of replicas + # discoverer.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 2 # discoverer.maxUnavailable -- maximum number of unavailable replicas @@ -938,10 +938,10 @@ compressor: externalTrafficPolicy: "" # compressor.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # compressor.minReplicas -- minimum number of replicas + # compressor.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 3 - # compressor.maxReplicas -- maximum number of replicas + # compressor.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 15 # compressor.maxUnavailable -- maximum number of unavailable replicas @@ -1053,11 +1053,11 @@ compressor: # compressor.backup.client -- grpc client for backup (overrides defaults.grpc.client) client: {} compress: - # compressor.compress.compress_algorithm -- compression algorithm + # compressor.compress.compress_algorithm -- compression algorithm. # must be `gob`, `gzip`, `lz4` or `zstd` compress_algorithm: zstd - # compressor.compress.compression_level -- compression level - # value range relies on which algorithm is used + # compressor.compress.compression_level -- compression level. + # value range relies on which algorithm is used. # `gob`: level will be ignored. # `gzip`: -1 (default compression), 0 (no compression), or 1 (best speed) to 9 (best compression). # `lz4`: >= 0, higher is better compression. @@ -1091,10 +1091,10 @@ backupManager: externalTrafficPolicy: "" # backupManager.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # backupManager.minReplicas -- minimum number of replicas + # backupManager.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 3 - # backupManager.maxReplicas -- maximum number of replicas + # backupManager.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 15 # backupManager.maxUnavailable -- maximum number of unavailable replicas @@ -1585,10 +1585,10 @@ meta: externalTrafficPolicy: "" # meta.progressDeadlineSeconds -- progress deadline seconds progressDeadlineSeconds: 600 - # meta.minReplicas -- minimum number of replicas + # meta.minReplicas -- minimum number of replicas. # if HPA is disabled, the replicas will be set to this value minReplicas: 2 - # meta.maxReplicas -- maximum number of replicas + # meta.maxReplicas -- maximum number of replicas. # if HPA is disabled, this value will be ignored. maxReplicas: 10 # meta.maxUnavailable -- maximum number of unavailable replicas From a13c98800f2c4dc8166cc0f7651ce4358c547b44 Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Fri, 22 May 2020 10:19:32 +0900 Subject: [PATCH 3/5] :green_heart: test Signed-off-by: Rintaro Okamura --- .github/workflows/helm-docs-test.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/helm-docs-test.yml diff --git a/.github/workflows/helm-docs-test.yml b/.github/workflows/helm-docs-test.yml new file mode 100644 index 0000000000..d39e745668 --- /dev/null +++ b/.github/workflows/helm-docs-test.yml @@ -0,0 +1,20 @@ +name: Run helm-docs for test +on: +- pull_request + +jobs: + helm-docs-test: + name: Run helm-docs + runs-on: ubuntu-latest + container: + image: vdaas/vald-ci-container:nightly + steps: + - name: Check out code. + uses: actions/checkout@v1 + with: + fetch-depth: 0 + - name: Run helm-docs + run: | + make helm/docs/vald + + cat charts/vald/README.md From a107388346bb61f1071ae24f46ea09b953ea87be Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Fri, 22 May 2020 10:27:13 +0900 Subject: [PATCH 4/5] Revert ":green_heart: test" This reverts commit a13c98800f2c4dc8166cc0f7651ce4358c547b44. --- .github/workflows/helm-docs-test.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/helm-docs-test.yml diff --git a/.github/workflows/helm-docs-test.yml b/.github/workflows/helm-docs-test.yml deleted file mode 100644 index d39e745668..0000000000 --- a/.github/workflows/helm-docs-test.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Run helm-docs for test -on: -- pull_request - -jobs: - helm-docs-test: - name: Run helm-docs - runs-on: ubuntu-latest - container: - image: vdaas/vald-ci-container:nightly - steps: - - name: Check out code. - uses: actions/checkout@v1 - with: - fetch-depth: 0 - - name: Run helm-docs - run: | - make helm/docs/vald - - cat charts/vald/README.md From 746f4f628654212357a10b29e82d78a0ef8a51d2 Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Fri, 22 May 2020 10:34:42 +0900 Subject: [PATCH 5/5] :green_heart: Revise order of update commands Signed-off-by: Rintaro Okamura --- .github/workflows/semver.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semver.yml b/.github/workflows/semver.yml index 370dc278c5..d3775b0499 100644 --- a/.github/workflows/semver.yml +++ b/.github/workflows/semver.yml @@ -37,6 +37,9 @@ jobs: exit 0 fi echo "version updated: ${GITWERK_RESULT}" + + git checkout master + echo "${GITWERK_RESULT}" > versions/VALD_VERSION sed -i -e "s/^version: .*$/version: ${GITWERK_RESULT}/" charts/vald/Chart.yaml @@ -47,8 +50,6 @@ jobs: make helm/docs/vald make helm/docs/vald-helm-operator - git checkout master - git config --global user.name "vdaas-ci" git config --global user.email "ci@vdaas.org"