merged main

vmware-tanzu · Dec 15, 2022 · bcd5479 · bcd5479
2 parents 8eedcf8 + ed020ef
commit bcd5479
Show file tree

Hide file tree

Showing 25 changed files with 2,523 additions and 1,666 deletions.
diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml
@@ -19,7 +19,7 @@ on:
         default: false
 
 env:
-  CHARTMUSEUM_VERSION: "3.9.1"
+  CHARTMUSEUM_VERSION: "3.9.2"
   CHARTS_REPO_ORIGINAL: "bitnami/charts"
   BRANCH_CHARTS_REPO_ORIGINAL: "main"
   CHARTS_REPO_FORKED: "kubeapps-bot/charts"
@@ -34,12 +34,11 @@ env:
   KUBEAPPS_REPO: "vmware-tanzu/kubeapps"
   BRANCH_KUBEAPPS_REPO: "main"
   README_GENERATOR_REPO: "bitnami-labs/readme-generator-for-helm"
-  DOCKER_VERSION: "20.10.18"
   DOCKER_REGISTRY_VERSION: "2.8.1"
-  GOLANG_VERSION: "1.19.2"
+  GOLANG_VERSION: "1.19.3"
   HELM_VERSION_MIN: "v3.2.0"
-  HELM_VERSION_STABLE: "v3.10.1"
-  GITHUB_VERSION: "2.18.1"
+  HELM_VERSION_STABLE: "v3.10.2"
+  GITHUB_VERSION: "2.20.2"
   IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy kubeapps-apis"
   # IMG_DEV_TAG is the tags used for the Kubeapps docker images. Ideally there should be an IMG_PROD_TAG
   # but its value is dynamic and GitHub actions doesn't support it in the `env` block, so it is generated
@@ -52,16 +51,16 @@ env:
   IMG_PREFIX_FOR_FORKS: "your-dockerhub-username/"
   # Currently, we only build the images for linux/amd64 because building cross-platform images is extremely slow...
   IMG_PLATFORMS: "linux/amd64"
-  KAPP_CONTROLLER_VERSION: "v0.42.0"
+  KAPP_CONTROLLER_VERSION: "v0.43.2"
   K8S_KIND_VERSION: "v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586"
-  KIND_VERSION: "v0.16.0"
+  KIND_VERSION: "v0.17.0"
   KUBECTL_VERSION: "v1.24.7"
   MKCERT_VERSION: "v1.4.4"
-  NODE_VERSION: "16.18.0"
+  NODE_VERSION: "16.18.1"
   OLM_VERSION: "v0.22.0"
-  POSTGRESQL_VERSION: "14.5.0-debian-11-r31"
-  RUST_VERSION: "1.64.0"
-  SEMVER_VERSION: "3.3.0"
+  POSTGRESQL_VERSION: "15.1.0-debian-11-r6"
+  RUST_VERSION: "1.65.0"
+  SEMVER_VERSION: "3.4.0"
   GKE_STABLE_VERSION: "1.22"
   GKE_REGULAR_VERSION: "1.23"
   GKE_ZONE: "us-east1-c"

diff --git a/cmd/apprepository-controller/Dockerfile b/cmd/apprepository-controller/Dockerfile
@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.19.2 as builder
+FROM bitnami/golang:1.19.3 as builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 COPY pkg pkg
@@ -17,16 +17,16 @@ RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILIN
 ARG lint
 
 RUN if [ ! -z "$lint" ]; then \
-    # Run golangci-lint to detect issues
-    golangci-lint run --timeout=10m ./cmd/apprepository-controller/... && \
-    golangci-lint run --timeout=10m ./pkg/... ; \
+  # Run golangci-lint to detect issues
+  golangci-lint run --timeout=10m ./cmd/apprepository-controller/... && \
+  golangci-lint run --timeout=10m ./pkg/... ; \
   fi
 
 # With the trick below, Go's build cache is kept between builds.
 # https://github.com/golang/go/issues/27719#issuecomment-514747274
 RUN --mount=type=cache,target=/go/pkg/mod \
   --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd.version=$VERSION" ./cmd/apprepository-controller
+  CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd.version=$VERSION" ./cmd/apprepository-controller
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

diff --git a/cmd/asset-syncer/Dockerfile b/cmd/asset-syncer/Dockerfile
@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.19.2 as builder
+FROM bitnami/golang:1.19.3 as builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 COPY pkg pkg
@@ -17,16 +17,16 @@ RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILIN
 ARG lint
 
 RUN if [ ! -z "$lint" ]; then \
-    # Run golangci-lint to detect issues
-    golangci-lint run --timeout=10m ./cmd/asset-syncer/... && \
-    golangci-lint run --timeout=10m ./pkg/... ; \
+  # Run golangci-lint to detect issues
+  golangci-lint run --timeout=10m ./cmd/asset-syncer/... && \
+  golangci-lint run --timeout=10m ./pkg/... ; \
   fi
 
 # With the trick below, Go's build cache is kept between builds.
 # https://github.com/golang/go/issues/27719#issuecomment-514747274
 RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd.version=$VERSION" ./cmd/asset-syncer
+  --mount=type=cache,target=/root/.cache/go-build \
+  CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd.version=$VERSION" ./cmd/asset-syncer
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

diff --git a/cmd/kubeapps-apis/Dockerfile b/cmd/kubeapps-apis/Dockerfile
@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.19.2 as builder
+FROM bitnami/golang:1.19.3 as builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 ARG VERSION="devel"
@@ -34,7 +34,7 @@ RUN if [ ! -z "$lint" ]; then \
     # Run golangci-lint to detect issues
     golangci-lint run --timeout=10m ./cmd/kubeapps-apis/... && \
     golangci-lint run --timeout=10m ./pkg/...; \
-  fi
+    fi
 
 # Lint the proto files to detect errors at build time
 RUN /tmp/buf lint ./cmd/kubeapps-apis

diff --git a/cmd/kubeapps-apis/buf.lock b/cmd/kubeapps-apis/buf.lock
@@ -4,8 +4,8 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 783e4b5374fa488ab068d08af9658438
+    commit: 5abafbf55b5c4c07ad5fb06d2599560f
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
-    commit: b96615cde70c403f8075c48e56178f88
+    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
diff --git a/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json b/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json
@@ -5565,14 +5565,6 @@
       "description": "The type of secret. Currently Kubeapps itself only deals with OPAQUE\nand docker config json secrets, but we define all so we can correctly\nlist the secret names with their types.\nSee https://kubernetes.io/docs/concepts/configuration/secret/#secret-types",
       "title": "SecretType"
     },
-    "v1alpha1SetUserManagedSecretsResponse": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "boolean"
-        }
-      }
-    },
     "v1alpha1SshCredentials": {
       "type": "object",
       "properties": {