From 497c7dd658a43bf4151696bfc403057c1328cda0 Mon Sep 17 00:00:00 2001 From: Yusuke Kato Date: Thu, 15 Jun 2023 11:38:35 +0900 Subject: [PATCH] revert v1.7.6 (#2064) Signed-off-by: kpango --- CHANGELOG.md | 118 ------------------------- Makefile | 2 +- Makefile.d/docker.mk | 2 +- charts/vald-helm-operator/Chart.yaml | 2 +- charts/vald-helm-operator/README.md | 10 +-- charts/vald-helm-operator/values.yaml | 2 +- charts/vald/Chart.yaml | 2 +- charts/vald/README.md | 4 +- charts/vald/values.yaml | 2 +- dockers/agent/core/ngt/Dockerfile | 4 +- dockers/agent/sidecar/Dockerfile | 17 +++- dockers/ci/base/Dockerfile | 4 +- dockers/dev/Dockerfile | 2 +- dockers/discoverer/k8s/Dockerfile | 20 ++++- dockers/gateway/filter/Dockerfile | 19 +++- dockers/gateway/lb/Dockerfile | 19 +++- dockers/manager/index/Dockerfile | 19 +++- dockers/operator/helm/Dockerfile | 58 +++++++----- dockers/tools/cli/loadtest/Dockerfile | 15 +++- example/client/go.mod | 3 +- example/client/go.sum | 13 +-- go.mod | 7 +- go.sum | 14 ++- k8s/agent/configmap.yaml | 4 +- k8s/agent/pdb.yaml | 4 +- k8s/agent/priorityclass.yaml | 4 +- k8s/agent/statefulset.yaml | 4 +- k8s/agent/svc.yaml | 4 +- k8s/discoverer/clusterrole.yaml | 4 +- k8s/discoverer/clusterrolebinding.yaml | 4 +- k8s/discoverer/configmap.yaml | 4 +- k8s/discoverer/deployment.yaml | 6 +- k8s/discoverer/pdb.yaml | 4 +- k8s/discoverer/priorityclass.yaml | 4 +- k8s/discoverer/serviceaccount.yaml | 4 +- k8s/discoverer/svc.yaml | 4 +- k8s/gateway/lb/configmap.yaml | 4 +- k8s/gateway/lb/deployment.yaml | 6 +- k8s/gateway/lb/hpa.yaml | 4 +- k8s/gateway/lb/pdb.yaml | 4 +- k8s/gateway/lb/priorityclass.yaml | 4 +- k8s/gateway/lb/svc.yaml | 4 +- k8s/manager/index/configmap.yaml | 4 +- k8s/manager/index/deployment.yaml | 6 +- k8s/manager/index/pdb.yaml | 4 +- k8s/manager/index/priorityclass.yaml | 4 +- k8s/manager/index/svc.yaml | 4 +- k8s/operator/helm/operator.yaml | 6 +- k8s/operator/helm/svc.yaml | 4 +- versions/HELM_VERSION | 2 +- versions/KIND_VERSION | 2 +- versions/KUBECTL_VERSION | 2 +- versions/PROTOBUF_VERSION | 2 +- versions/TELEPRESENCE_VERSION | 2 +- versions/VALD_VERSION | 2 +- 55 files changed, 226 insertions(+), 256 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b33f5311c..791513324e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,123 +1,5 @@ # CHANGELOG -## v1.7.6 - -### Docker images - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
componentDocker pull
Agent NGT - docker pull vdaas/vald-agent-ngt:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-agent-ngt:v1.7.6 -
Agent sidecar - docker pull vdaas/vald-agent-sidecar:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-agent-sidecar:v1.7.6 -
Discoverers - docker pull vdaas/vald-discoverer-k8s:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-discoverer-k8s:v1.7.6 -
Gateways - docker pull vdaas/vald-lb-gateway:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-lb-gateway:v1.7.6
- docker pull vdaas/vald-filter-gateway:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-filter-gateway:v1.7.6 -
Index Manager - docker pull vdaas/vald-manager-index:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-manager-index:v1.7.6 -
Helm Operator - docker pull vdaas/vald-helm-operator:v1.7.6
- docker pull ghcr.io/vdaas/vald/vald-helm-operator:v1.7.6 -
- -### Documents - -- [GoDoc](https://pkg.go.dev/github.com/vdaas/vald@v1.7.6) -- [Helm Chart Reference](https://github.com/vdaas/vald/blob/v1.7.6/charts/vald/README.md) -- [Helm Operator Chart Reference](https://github.com/vdaas/vald/blob/v1.7.6/charts/vald-helm-operator/README.md) - -### Changes - -⚠️ ⚠️ ⚠️ Warning ⚠️ ⚠️ ⚠️ - -- `v1.7.6` does not support `vald-agent-sidecar` for some reason. -- You can use the `vald-agent-sidecar` by setting the `vald-agent-ngt` image tag as `v1.7.5` or earlier. -- We will support `vald-agent-sidecar` in the future version again. - -:sparkles: New feature - -- Add search algorithm benchmark and update search aggregation algo [#2044](https://github.com/vdaas/vald/pull/2044) -- Add broken index backup [#2034](https://github.com/vdaas/vald/pull/2034) -- Add network policy [#2022](https://github.com/vdaas/vald/pull/2022) - -:recycle: Refactor - -- Add save index operation log [#2048](https://github.com/vdaas/vald/pull/2048) -- Added flg that can disable to ingress defaultBackend [#1976](https://github.com/vdaas/vald/pull/1976) -- Refactor and Add test for service/ngt.go [#2040](https://github.com/vdaas/vald/pull/2040) -- Add e2e envs to devcontainer [#2032](https://github.com/vdaas/vald/pull/2032) -- Update RoundTrip retry condition [#2033](https://github.com/vdaas/vald/pull/2033) - -:bug: Bugfix - -- Fix fp16 problems [#2049](https://github.com/vdaas/vald/pull/2049) -- Add KUBECTL_VERSION value to workflow [#2052](https://github.com/vdaas/vald/pull/2052) -- Remove sudo from kubectl and small refactor around os/arch [#2037](https://github.com/vdaas/vald/pull/2037) - -:pencil2: Document - -- Add documentation for devcontiner [#2042](https://github.com/vdaas/vald/pull/2042) -- Create README for each docker image [#2014](https://github.com/vdaas/vald/pull/2014) - -:green_heart: CI - -- Disable deepsource TestCoverage due to the Deepsource Coverage collect server timeout is too short for Vald testing [#2038](https://github.com/vdaas/vald/pull/2038) -- Update Docker Build workflow with forked sources [#2036](https://github.com/vdaas/vald/pull/2036) -- Fix e2e-max-dim test [#2028](https://github.com/vdaas/vald/pull/2028) -- Fix E2E actions on PR [#2025](https://github.com/vdaas/vald/pull/2025) -- Change E2E actions to use local charts on PR [#2024](https://github.com/vdaas/vald/pull/2024) -- Update format chatops [#2021](https://github.com/vdaas/vald/pull/2021) -- Format code with prettier and gofumpt [#2015](https://github.com/vdaas/vald/pull/2015) - -:chart_with_upwards_trend: Metrics/Tracing - -- Add command to deploy monitoring stack [#2030](https://github.com/vdaas/vald/pull/2030) -- Fixed duplicate counting in CPU graphs [#2019](https://github.com/vdaas/vald/pull/2019) - -:arrow_up: Update dependencies - -- Update go modules [#2053](https://github.com/vdaas/vald/pull/2053) -- Update NGT version [#2026](https://github.com/vdaas/vald/pull/2026) - -:handshake: Contributor - -- Add takuyaymd as a contributor for maintenance [#2020](https://github.com/vdaas/vald/pull/2020) - ## v1.7.5 ### Docker images diff --git a/Makefile b/Makefile index d987999e96..202fd6d8f7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ ORG ?= vdaas NAME = vald GOPKG = github.com/$(ORG)/$(NAME) -GOPRIVATE = $(GOPKG),$(GOPKG)/apis +GOPRIVATE = $(GOPKG),$(GOPKG)/apis,$(GOPKG)-client-go DATETIME = $(eval DATETIME := $(shell date -u +%Y/%m/%d_%H:%M:%S%z))$(DATETIME) TAG ?= latest CRORG ?= $(ORG) diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 0f4b14b786..a8858a27a6 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -22,7 +22,7 @@ docker/build: \ docker/build/gateway-lb \ docker/build/gateway-filter \ docker/build/manager-index \ - docker/build/helm-operator + docker/build/operator/helm .PHONY: docker/name/org docker/name/org: diff --git a/charts/vald-helm-operator/Chart.yaml b/charts/vald-helm-operator/Chart.yaml index 183a8b4fc5..d1acbfcf89 100644 --- a/charts/vald-helm-operator/Chart.yaml +++ b/charts/vald-helm-operator/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: vald-helm-operator -version: v1.7.6 +version: v1.7.5 description: A Helm chart for vald-helm-operator type: application keywords: diff --git a/charts/vald-helm-operator/README.md b/charts/vald-helm-operator/README.md index ec475d6636..3c0984e554 100644 --- a/charts/vald-helm-operator/README.md +++ b/charts/vald-helm-operator/README.md @@ -2,7 +2,7 @@ This is a Helm chart to install vald-helm-operator. -Current chart version is `v1.7.6` +Current chart version is `v1.7.5` ## Table of Contents @@ -26,13 +26,13 @@ Run the following command to install the chart, Please upgrade the CRDs first because Helm doesn't have a support to upgrade CRDs. - $ kubectl replace -f https://raw.githubusercontent.com/vdaas/vald/v1.7.6/charts/vald-helm-operator/crds/valdrelease.yaml - $ kubectl replace -f https://raw.githubusercontent.com/vdaas/vald/v1.7.6/charts/vald-helm-operator/crds/valdhelmoperatorrelease.yaml + $ kubectl replace -f https://raw.githubusercontent.com/vdaas/vald/v1.7.5/charts/vald-helm-operator/crds/valdrelease.yaml + $ kubectl replace -f https://raw.githubusercontent.com/vdaas/vald/v1.7.5/charts/vald-helm-operator/crds/valdhelmoperatorrelease.yaml After upgrading CRDs, you can upgrade the operator. If you're using `valdhelmoperatorrelease` (or `vhor`) resource, please update the `spec.image.tag` field of it. - $ kubectl patch vhor vhor-release -p '{"spec":{"image":{"tag":"v1.7.6"}}}' + $ kubectl patch vhor vhor-release -p '{"spec":{"image":{"tag":"v1.7.5"}}}' On the other hand, please update the operator's deployment manually. @@ -79,7 +79,7 @@ spec: {} | healthPort | int | `8081` | port of health endpoint | | image.pullPolicy | string | `"Always"` | image pull policy | | image.repository | string | `"vdaas/vald-helm-operator"` | image repository | -| image.tag | string | `"v1.7.6"` | image tag | +| image.tag | string | `"v1.7.5"` | image tag | | leaderElectionID | string | `"vald-helm-operator"` | name of the configmap that is used for holding the leader lock. | | livenessProbe.enabled | bool | `true` | enable liveness probe. | | livenessProbe.failureThreshold | int | `2` | liveness probe failure threshold | diff --git a/charts/vald-helm-operator/values.yaml b/charts/vald-helm-operator/values.yaml index d5e27b84b9..84515f3bdd 100644 --- a/charts/vald-helm-operator/values.yaml +++ b/charts/vald-helm-operator/values.yaml @@ -29,7 +29,7 @@ image: repository: vdaas/vald-helm-operator # @schema {"name": "image.tag", "type": "string"} # image.tag -- image tag - tag: v1.7.6 + tag: v1.7.5 # @schema {"name": "image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]} # image.pullPolicy -- image pull policy pullPolicy: Always diff --git a/charts/vald/Chart.yaml b/charts/vald/Chart.yaml index 04b35535d5..93d586b2b2 100644 --- a/charts/vald/Chart.yaml +++ b/charts/vald/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: vald -version: v1.7.6 +version: v1.7.5 description: A distributed high scalable & high-speed approximate nearest neighbor search engine type: application keywords: diff --git a/charts/vald/README.md b/charts/vald/README.md index ba35bebd19..85708cfc09 100644 --- a/charts/vald/README.md +++ b/charts/vald/README.md @@ -2,7 +2,7 @@ This is a Helm chart to install Vald components. -Current chart version is `v1.7.6` +Current chart version is `v1.7.5` ## Table of Contents @@ -291,7 +291,7 @@ Run the following command to install the chart, | defaults.grpc.client.tls.enabled | bool | `false` | TLS enabled | | defaults.grpc.client.tls.insecure_skip_verify | bool | `false` | enable/disable skip SSL certificate verification | | defaults.grpc.client.tls.key | string | `"/path/to/key"` | TLS key path | -| defaults.image.tag | string | `"v1.7.6"` | docker image tag | +| defaults.image.tag | string | `"v1.7.5"` | docker image tag | | defaults.logging.format | string | `"raw"` | logging format. logging format must be `raw` or `json` | | defaults.logging.level | string | `"debug"` | logging level. logging level must be `debug`, `info`, `warn`, `error` or `fatal`. | | defaults.logging.logger | string | `"glg"` | logger name. currently logger must be `glg` or `zap`. | diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml index 628d49555d..530affa5f6 100644 --- a/charts/vald/values.yaml +++ b/charts/vald/values.yaml @@ -38,7 +38,7 @@ defaults: image: # @schema {"name": "defaults.image.tag", "type": "string"} # defaults.image.tag -- docker image tag - tag: v1.7.6 + tag: v1.7.5 # @schema {"name": "defaults.server_config", "type": "object", "anchor": "server_config"} server_config: # @schema {"name": "defaults.server_config.servers", "type": "object"} diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile index 1b8d71bc17..57e6780810 100644 --- a/dockers/agent/core/ngt/Dockerfile +++ b/dockers/agent/core/ngt/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* COPY --from=golang /usr/local/go $GOROOT -RUN mkdir $GOPATH +RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -97,7 +97,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME ngt diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile index fed8cf6264..cc2977a31d 100644 --- a/dockers/agent/sidecar/Dockerfile +++ b/dockers/agent/sidecar/Dockerfile @@ -19,23 +19,34 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV GOPATH /go +ENV GOROOT /opt/go +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 ENV ORG vdaas ENV REPO vald +ENV APP_NAME sidecar ENV PKG agent/sidecar ENV PKG_INTERNAL agent/internal -ENV APP_NAME sidecar +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -74,7 +85,7 @@ RUN make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME sidecar diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 452cfb6617..ac52f80beb 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -20,8 +20,7 @@ ARG MAINTAINER="vdaas.org vald team " FROM golang:${GO_VERSION} AS golang FROM ubuntu:devel AS builder - -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -90,3 +89,4 @@ RUN make ngt/install \ ENV PATH=$PATH:$GOPATH/bin RUN rm -rf "${GOPATH}/src/github.com/vdaas/vald/*" + diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 790183a51d..ea227e4087 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -18,7 +18,7 @@ ARG MAINTAINER="vdaas.org vald team " # skipcq: DOK-DL3026 FROM mcr.microsoft.com/vscode/devcontainers/go:1 AS base -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile index 940bc118b1..cd17b7f475 100644 --- a/dockers/discoverer/k8s/Dockerfile +++ b/dockers/discoverer/k8s/Dockerfile @@ -19,22 +19,34 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV PKG discoverer/k8s ENV APP_NAME discoverer + # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -69,12 +81,16 @@ COPY .git . RUN make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" +WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} +RUN cp sample.yaml /tmp/config.yaml + FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME discoverer COPY --from=builder /usr/bin/${APP_NAME} /go/bin/${APP_NAME} +COPY --from=builder /tmp/config.yaml /etc/server/config.yaml USER nonroot:nonroot diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile index 5a7335760b..8bf4d1eb2c 100644 --- a/dockers/gateway/filter/Dockerfile +++ b/dockers/gateway/filter/Dockerfile @@ -19,10 +19,17 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV PKG gateway/filter @@ -30,11 +37,15 @@ ENV APP_NAME filter # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -69,12 +80,16 @@ COPY .git . RUN make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" +WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} +RUN cp sample.yaml /tmp/config.yaml + FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME filter COPY --from=builder /usr/bin/${APP_NAME} /go/bin/${APP_NAME} +COPY --from=builder /tmp/config.yaml /etc/server/config.yaml USER nonroot:nonroot diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile index 050a7547fb..e88faee2d6 100644 --- a/dockers/gateway/lb/Dockerfile +++ b/dockers/gateway/lb/Dockerfile @@ -19,10 +19,17 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV PKG gateway/lb @@ -30,11 +37,15 @@ ENV APP_NAME lb # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -69,12 +80,16 @@ COPY .git . RUN make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" +WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} +RUN cp sample.yaml /tmp/config.yaml + FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME lb COPY --from=builder /usr/bin/${APP_NAME} /go/bin/${APP_NAME} +COPY --from=builder /tmp/config.yaml /etc/server/config.yaml USER nonroot:nonroot diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile index ce2ee1c51c..7b08bbded4 100644 --- a/dockers/manager/index/Dockerfile +++ b/dockers/manager/index/Dockerfile @@ -19,10 +19,17 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV PKG manager/index @@ -30,11 +37,15 @@ ENV APP_NAME index # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -69,12 +80,16 @@ COPY .git . RUN make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" +WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} +RUN cp sample.yaml /tmp/config.yaml + FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME index COPY --from=builder /usr/bin/${APP_NAME} /go/bin/${APP_NAME} +COPY --from=builder /tmp/config.yaml /etc/server/config.yaml USER nonroot:nonroot diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile index 1d3321e391..cb784a5110 100644 --- a/dockers/operator/helm/Dockerfile +++ b/dockers/operator/helm/Dockerfile @@ -26,8 +26,9 @@ ARG MAINTAINER="vdaas.org vald team " # skipcq: DOK-DL3026 FROM quay.io/operator-framework/helm-operator:${OPERATOR_SDK_VERSION} AS operator +FROM golang:${GO_VERSION} AS golang +FROM ubuntu:devel AS builder -FROM golang:${GO_VERSION} AS builder ARG OPERATOR_SDK_VERSION ARG VERSION ARG GROUP @@ -35,8 +36,38 @@ ARG VALD_KIND ARG VALD_HELM_OPERATOR_KIND ARG UPX_OPTIONS +ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No +ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald +ENV APP_NAME helm-operator + +# skipcq: DOK-DL3008 +RUN apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /var/cache/* \ + && apt-get update -y \ + && apt-get upgrade -y \ + && apt-get install -y --no-install-recommends --fix-missing \ + ca-certificates \ + build-essential \ + curl \ + upx \ + git \ + && apt-get clean \ + && rm -rf \ + /var/lib/apt/lists/* \ + /var/cache/* \ + && apt-get autoremove + +COPY --from=golang /usr/local/go $GOROOT +RUN mkdir -p "$GOPATH/src" RUN { \ echo "---"; \ @@ -51,9 +82,12 @@ RUN { \ } > /tmp/watches.yaml WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} + COPY go.mod . COPY go.sum . +RUN go mod download + WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal/errors COPY internal/errors . @@ -81,32 +115,17 @@ COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . +COPY .git . + RUN make helm/schema/vald helm/schema/vald-helm-operator \ && cp -r charts /charts -# skipcq: DOK-DL3008 -RUN apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /var/cache/* \ - && apt-get update -y \ - && apt-get upgrade -y \ - && apt-get install -y --no-install-recommends --fix-missing \ - upx \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /var/cache/* \ - && apt-get autoremove - -ENV APP_NAME helm-operator - COPY --from=operator /usr/local/bin/${APP_NAME} /usr/bin/${APP_NAME} RUN upx ${UPX_OPTIONS} "/usr/bin/${APP_NAME}" FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME helm-operator @@ -114,7 +133,6 @@ ENV HOME=/opt/helm WORKDIR ${HOME} COPY --from=builder /tmp/watches.yaml watches.yaml - COPY --from=builder /charts/vald helm-charts/vald COPY --from=builder /charts/vald-helm-operator helm-charts/vald-helm-operator COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile index 9ae1f08974..3bd8a27b0c 100644 --- a/dockers/tools/cli/loadtest/Dockerfile +++ b/dockers/tools/cli/loadtest/Dockerfile @@ -17,10 +17,17 @@ ARG GO_VERSION=latest ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS builder +FROM golang:${GO_VERSION} AS golang + +FROM ubuntu:devel AS builder ENV GO111MODULE on +ENV DEBIAN_FRONTEND noninteractive +ENV INITRD No ENV LANG en_US.UTF-8 +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV APP_NAME loadtest @@ -28,6 +35,9 @@ ENV PKG tools/cli/${APP_NAME} # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + build-essential \ + curl \ upx \ git \ libhdf5-dev \ @@ -35,6 +45,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +COPY --from=golang /usr/local/go $GOROOT RUN mkdir -p "$GOPATH/src" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -96,7 +107,7 @@ RUN GO_VERSION="$(< GO_VERSION)" \ FROM ubuntu:devel # Start From Alpine For Debug Environment # FROM alpine:latest -LABEL maintainer "${MAINTAINER}" +LABEL maintainer="${MAINTAINER}" ENV APP_NAME loadtest diff --git a/example/client/go.mod b/example/client/go.mod index 96f249f740..3d601cdd4b 100644 --- a/example/client/go.mod +++ b/example/client/go.mod @@ -23,7 +23,7 @@ replace ( require ( github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1 github.com/kpango/glg v1.6.14 - github.com/vdaas/vald-client-go v1.7.6 + github.com/vdaas/vald-client-go v1.7.5 gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 google.golang.org/grpc v1.55.0 ) @@ -33,7 +33,6 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/kpango/fastime v1.1.9 // indirect - github.com/planetscale/vtprotobuf v0.4.0 // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.9.0 // indirect golang.org/x/text v0.10.0 // indirect diff --git a/example/client/go.sum b/example/client/go.sum index 1ea65a322b..3fac3421d9 100644 --- a/example/client/go.sum +++ b/example/client/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/protoc-gen-validate v1.0.1 h1:kt9FtLiooDc0vbwTLhdg3dyNX1K9Qwa1EK9LcD4jVUQ= github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -13,14 +12,9 @@ github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1 h1:rxyM+7uaZQ35P9fbixd github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1/go.mod h1:CAYeq6us9NfnRkSz67/xKVIR6/vaY5ZQZRe6IVcaIKg= github.com/kpango/glg v1.6.15 h1:nw0xSxpSyrDIWHeb3dvnE08PW+SCbK+aYFETT75IeLA= github.com/kpango/glg v1.6.15/go.mod h1:cmsc7Yeu8AS3wHLmN7bhwENXOpxfq+QoqxCIk2FneRk= -github.com/planetscale/vtprotobuf v0.4.0 h1:NEI+g4woRaAZgeZ3sAvbtyvMBRjIv5kE7EWYQ8m4JwY= -github.com/planetscale/vtprotobuf v0.4.0/go.mod h1:wm1N3qk9G/4+VM1WhpkLbvY/d8+0PbwYYpP5P5VhTks= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/vdaas/vald-client-go v1.7.6 h1:Clg45IgCsR7FIVARn/WNbTHCvu4FCaJWBDAQnYcCgDs= -github.com/vdaas/vald-client-go v1.7.6/go.mod h1:yiEqHM1L8j3Y7jXoypIozy79ESgthYtMvMTZLRWY6YI= +github.com/vdaas/vald-client-go v1.7.5 h1:cmY528/1fddCt7iXvqZDdmbm3CqrD7X1XbE/jXdqcSg= +github.com/vdaas/vald-client-go v1.7.5/go.mod h1:cEFd/dZccTiOO2EK+D7iw5/j0xCqanX/+bBw17vR9qM= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -31,7 +25,6 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 h1:vJpL69PeUullhJyKtTjHjENEmZU3BkO4e+fod7nKzgM= gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946/go.mod h1:BQUWDHIAygjdt1HnUPQ0eWqLN2n5FwJycrpYUVUOx2I= google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= @@ -44,5 +37,3 @@ google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go.mod b/go.mod index a774c85e96..cf3ab9d8cc 100755 --- a/go.mod +++ b/go.mod @@ -398,7 +398,7 @@ replace ( github.com/stretchr/objx => github.com/stretchr/objx v0.5.0 github.com/stretchr/testify => github.com/stretchr/testify v1.8.4 github.com/ugorji/go/codec => github.com/ugorji/go/codec v1.2.11 - github.com/vdaas/vald-client-go => github.com/vdaas/vald-client-go v1.7.6 + github.com/vdaas/vald-client-go => github.com/vdaas/vald-client-go v1.7.5 github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0 github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.4 github.com/xdg-go/pbkdf2 => github.com/xdg-go/pbkdf2 v1.0.0 @@ -447,10 +447,10 @@ replace ( golang.org/x/image => golang.org/x/image v0.8.0 golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/mobile => golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda - golang.org/x/mod => golang.org/x/mod v0.10.0 + golang.org/x/mod => golang.org/x/mod v0.11.0 golang.org/x/net => golang.org/x/net v0.11.0 golang.org/x/oauth2 => golang.org/x/oauth2 v0.9.0 - golang.org/x/sync => golang.org/x/sync v0.2.0 + golang.org/x/sync => golang.org/x/sync v0.3.0 golang.org/x/sys => golang.org/x/sys v0.9.0 golang.org/x/term => golang.org/x/term v0.9.0 golang.org/x/text => golang.org/x/text v0.10.0 @@ -629,7 +629,6 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/planetscale/vtprotobuf v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.15.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect diff --git a/go.sum b/go.sum index b6799fb414..1dea0ae64e 100644 --- a/go.sum +++ b/go.sum @@ -570,8 +570,6 @@ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzL github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg= -github.com/planetscale/vtprotobuf v0.4.0 h1:NEI+g4woRaAZgeZ3sAvbtyvMBRjIv5kE7EWYQ8m4JwY= -github.com/planetscale/vtprotobuf v0.4.0/go.mod h1:wm1N3qk9G/4+VM1WhpkLbvY/d8+0PbwYYpP5P5VhTks= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= @@ -630,8 +628,8 @@ github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955u github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/vdaas/vald-client-go v1.7.6 h1:Clg45IgCsR7FIVARn/WNbTHCvu4FCaJWBDAQnYcCgDs= -github.com/vdaas/vald-client-go v1.7.6/go.mod h1:yiEqHM1L8j3Y7jXoypIozy79ESgthYtMvMTZLRWY6YI= +github.com/vdaas/vald-client-go v1.7.5 h1:cmY528/1fddCt7iXvqZDdmbm3CqrD7X1XbE/jXdqcSg= +github.com/vdaas/vald-client-go v1.7.5/go.mod h1:cEFd/dZccTiOO2EK+D7iw5/j0xCqanX/+bBw17vR9qM= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -698,14 +696,14 @@ golang.org/x/image v0.8.0 h1:agUcRXV/+w6L9ryntYYsF2x9fQTMd4T8fiiYXAVW6Jg= golang.org/x/image v0.8.0/go.mod h1:PwLxp3opCYg4WR2WO9P0L6ESnsD6bLTWcw8zanLMVFM= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs= golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= diff --git a/k8s/agent/configmap.yaml b/k8s/agent/configmap.yaml index 841443e8a2..8d2cc5ffb4 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: agent data: config.yaml: | diff --git a/k8s/agent/pdb.yaml b/k8s/agent/pdb.yaml index c58182ba48..1a50598b67 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: agent spec: maxUnavailable: 1 diff --git a/k8s/agent/priorityclass.yaml b/k8s/agent/priorityclass.yaml index 27c87adf2f..66f94c23ab 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: agent value: 1e+09 preemptionPolicy: Never diff --git a/k8s/agent/statefulset.yaml b/k8s/agent/statefulset.yaml index 5184b6e056..f4e08d07df 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: agent spec: serviceName: vald-agent-ngt diff --git a/k8s/agent/svc.yaml b/k8s/agent/svc.yaml index 28e1da4dee..b726a80e52 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: agent spec: ports: diff --git a/k8s/discoverer/clusterrole.yaml b/k8s/discoverer/clusterrole.yaml index 7161117e44..d9a23353b1 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer rules: - apiGroups: diff --git a/k8s/discoverer/clusterrolebinding.yaml b/k8s/discoverer/clusterrolebinding.yaml index 9c67ffb3a8..cfa0de4685 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/k8s/discoverer/configmap.yaml b/k8s/discoverer/configmap.yaml index 5a128f6f70..7c1df3cc27 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer data: config.yaml: | diff --git a/k8s/discoverer/deployment.yaml b/k8s/discoverer/deployment.yaml index 26f9a5a097..098cb73594 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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: 0b472fffedcc5bfab8f66d948b086fa1a016e1221a034f7794525bdf67b46827 + checksum/configmap: 2a181b1fc090090e46f63baf6d73a9d4c0842d58c254fcf728abedfcc0a5865d 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 28fda6d1b1..938f2e299b 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer spec: maxUnavailable: 50% diff --git a/k8s/discoverer/priorityclass.yaml b/k8s/discoverer/priorityclass.yaml index f78da7ed78..7471776384 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer value: 1e+06 globalDefault: false diff --git a/k8s/discoverer/serviceaccount.yaml b/k8s/discoverer/serviceaccount.yaml index bcad20678d..3d9819152a 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer diff --git a/k8s/discoverer/svc.yaml b/k8s/discoverer/svc.yaml index 87ea5b4665..d5f352de6f 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: discoverer spec: ports: diff --git a/k8s/gateway/lb/configmap.yaml b/k8s/gateway/lb/configmap.yaml index 718ca21919..e0f0dc68fc 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: gateway-lb data: config.yaml: | diff --git a/k8s/gateway/lb/deployment.yaml b/k8s/gateway/lb/deployment.yaml index 45cb8cde06..237dab2309 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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: dc5cf90161696b8f5fcf0ca2936570bc4c315b2951bf54e6adef919f071db45d + checksum/configmap: 78a4f6f8f76be8d8f58ff5de2f05c1f95a3bc9e1f791931e0c8f6e360f2303a8 profefe.com/enable: "true" profefe.com/port: "6060" profefe.com/service: vald-lb-gateway diff --git a/k8s/gateway/lb/hpa.yaml b/k8s/gateway/lb/hpa.yaml index 39e47a1495..cd44830fc0 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: gateway-lb spec: maxReplicas: 9 diff --git a/k8s/gateway/lb/pdb.yaml b/k8s/gateway/lb/pdb.yaml index 3ccbd28e4c..1e29600527 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: gateway-lb spec: maxUnavailable: 50% diff --git a/k8s/gateway/lb/priorityclass.yaml b/k8s/gateway/lb/priorityclass.yaml index 4d1c61be1b..4dc479e5e1 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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 3e1da0dff5..0a293b4030 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: gateway-lb spec: ports: diff --git a/k8s/manager/index/configmap.yaml b/k8s/manager/index/configmap.yaml index f7bb11a539..ebb1b46667 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: manager-index data: config.yaml: | diff --git a/k8s/manager/index/deployment.yaml b/k8s/manager/index/deployment.yaml index 3a4bd4a7fb..5877850d91 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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: 25f27c58701b1fe5a448442301b66d41896dc74f438d21b126b3d2b42c6737eb + checksum/configmap: 5a94a581342046177fdfad97f347750eae504f1e6f2a56927d988cbc676009c7 profefe.com/enable: "true" profefe.com/port: "6060" profefe.com/service: vald-manager-index diff --git a/k8s/manager/index/pdb.yaml b/k8s/manager/index/pdb.yaml index a49e5c5827..8f02d628d0 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: manager-index spec: maxUnavailable: 50% diff --git a/k8s/manager/index/priorityclass.yaml b/k8s/manager/index/priorityclass.yaml index 20e3ab6d88..fad5873f8f 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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 0696d91846..bb16b63522 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.7.6 + helm.sh/chart: vald-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: manager-index spec: ports: diff --git a/k8s/operator/helm/operator.yaml b/k8s/operator/helm/operator.yaml index 6d23b2f94e..a333a7b388 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.7.6 + helm.sh/chart: vald-helm-operator-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 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.7.6" + image: "vdaas/vald-helm-operator:v1.7.5" imagePullPolicy: Always args: - "run" diff --git a/k8s/operator/helm/svc.yaml b/k8s/operator/helm/svc.yaml index 28cfb9c9e8..27d5986ad6 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.7.6 + helm.sh/chart: vald-helm-operator-v1.7.5 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: release-name - app.kubernetes.io/version: v1.7.6 + app.kubernetes.io/version: v1.7.5 app.kubernetes.io/component: helm-operator spec: ports: diff --git a/versions/HELM_VERSION b/versions/HELM_VERSION index b0ab92d423..10d3e4ccb1 100644 --- a/versions/HELM_VERSION +++ b/versions/HELM_VERSION @@ -1 +1 @@ -v3.12.0 +v3.12.1 diff --git a/versions/KIND_VERSION b/versions/KIND_VERSION index 1cf0537c34..5a03fb737b 100644 --- a/versions/KIND_VERSION +++ b/versions/KIND_VERSION @@ -1 +1 @@ -0.19.0 +0.20.0 diff --git a/versions/KUBECTL_VERSION b/versions/KUBECTL_VERSION index 6b9453d82b..6c6ba5f810 100644 --- a/versions/KUBECTL_VERSION +++ b/versions/KUBECTL_VERSION @@ -1 +1 @@ -v1.27.2 \ No newline at end of file +v1.27.3 \ No newline at end of file diff --git a/versions/PROTOBUF_VERSION b/versions/PROTOBUF_VERSION index 3c8ce91a46..4a412fd92a 100644 --- a/versions/PROTOBUF_VERSION +++ b/versions/PROTOBUF_VERSION @@ -1 +1 @@ -23.2 +23.3 diff --git a/versions/TELEPRESENCE_VERSION b/versions/TELEPRESENCE_VERSION index 882cbab0f3..edcfe40d19 100644 --- a/versions/TELEPRESENCE_VERSION +++ b/versions/TELEPRESENCE_VERSION @@ -1 +1 @@ -2.14.0-rc.12 +2.14.0 diff --git a/versions/VALD_VERSION b/versions/VALD_VERSION index 12751ca7b0..535cc4dda6 100644 --- a/versions/VALD_VERSION +++ b/versions/VALD_VERSION @@ -1 +1 @@ -v1.7.6 +v1.7.5