Update images and tools versions before new release

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.22
+ go-version: 1.23
  if: ${{ matrix.language == 'go' }}
 
  # Initializes the CodeQL tools for scanning.

.github/workflows/kubeapps-general.yaml

@@ -35,10 +35,11 @@ env:
  BRANCH_KUBEAPPS_REPO: "main"
  README_GENERATOR_REPO: "bitnami-labs/readme-generator-for-helm"
  DOCKER_REGISTRY_VERSION: "2.8.3"
- GOLANG_VERSION: "1.22.5"
+ GOLANG_VERSION: "1.23.2"
+ GOLANGCI_LINT_VERSION: "1.61.0"
  HELM_VERSION_MIN: "v3.8.0"
- HELM_VERSION_STABLE: "v3.15.3"
- GITHUB_VERSION: "2.53.0"
+ HELM_VERSION_STABLE: "v3.16.2"
+ GITHUB_VERSION: "2.59.0"
  IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy kubeapps-apis oci-catalog"
  # 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
@@ -51,19 +52,19 @@ 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.50.5"
+ KAPP_CONTROLLER_VERSION: "v0.50.6"
  FLUX_VERSION: "v2.2.3"
- KIND_VERSION: "v0.23.0"
+ KIND_VERSION: "v0.24.0"
+ K8S_KIND_VERSION: "v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114"
  MKCERT_VERSION: "v1.4.4"
- NODE_VERSION: "20.15.1"
+ NODE_VERSION: "20.18.0"
  OLM_VERSION: "v0.28.0"
- POSTGRESQL_VERSION: "16.3.0-debian-12-r19"
- RUST_VERSION: "1.79.0"
+ POSTGRESQL_VERSION: "17.0.0-debian-12-r3"
+ RUST_VERSION: "1.81.0"
  SEMVER_VERSION: "3.4.0"
- K8S_KIND_VERSION: "v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8"
- KUBECTL_VERSION: "v1.29.7"
- GKE_REGULAR_VERSION: "1.29"
- GKE_STABLE_VERSION: "1.27"
+ KUBECTL_VERSION: "v1.30.5"
+ GKE_REGULAR_VERSION: "1.30"
+ GKE_STABLE_VERSION: "1.30"
  GKE_ZONE: "us-east1-c"
  GKE_PROJECT: "vmware-kubeapps-ci"
  GKE_CLUSTER: "kubeapps-test"
@@ -128,6 +129,7 @@ jobs:
  fi
 
  echo "golang_version=${GOLANG_VERSION}" >> $GITHUB_OUTPUT
+ echo "golangci_lint_version=${GOLANGCI_LINT_VERSION}" >> $GITHUB_OUTPUT
  echo "ssh_key_kubeapps_deploy_filename=${SSH_KEY_KUBEAPPS_DEPLOY_FILENAME}" >> $GITHUB_OUTPUT
  echo "ssh_key_forked_charts_deploy_filename=${SSH_KEY_FORKED_CHARTS_DEPLOY_FILENAME}" >> $GITHUB_OUTPUT
  echo "img_modifier=${IMG_MODIFIER}" >> $GITHUB_OUTPUT
@@ -137,6 +139,7 @@ jobs:
  - name: Show outputs
  run: |
  echo "GOLANG_VERSION: ${{steps.set-outputs.outputs.golang_version}}"
+ echo "GOLANGCI_LINT_VERSION: ${{steps.set-outputs.outputs.golangci_lint_version}}"
  echo "IMG_MODIFIER: ${{steps.set-outputs.outputs.img_modifier}}"
  echo "IMG_PREFIX: ${{steps.set-outputs.outputs.img_prefix}}"
  echo "IMG_DEV_TAG: ${{steps.set-outputs.outputs.img_dev_tag}}"
@@ -156,6 +159,7 @@ jobs:
  uses: ./.github/workflows/linters.yml
  with:
  golang_version: ${{ needs.setup.outputs.golang_version }}
+ golangci_lint_version: ${{ needs.setup.outputs.golangci_lint_version }}
 
  linters_result:
  if: inputs.run_linters && always()
@@ -464,10 +468,14 @@ jobs:
  source ./script/lib/libcitools.sh
 
  installKind ${KIND_VERSION}
+ set -x
  installKubectl ${KUBECTL_VERSION}
+ set +x
  installMkcert ${MKCERT_VERSION}
  installHelm ${HELM_VERSION_MIN}
  installHelm ${HELM_VERSION_STABLE} helm-stable
+ - name: Setup upterm session
+ uses: lhotari/action-upterm@v1
  - name: "Spin up Kind cluster"
  run: |
  set -eu

.github/workflows/linters.yml

@@ -8,7 +8,11 @@ on:
  golang_version:
  type: string
  required: false
- default: "1.22"
+ default: "1.23"
+ golangci_lint_version:
+ type: string
+ required: false
+ default: "1.61.0"
 
 jobs:
  yaml-linter:
@@ -35,7 +39,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: golangci/golangci-lint-action@v6
  with:
- version: v1.59.1
+ version: ${{ inputs.golangci_lint_version }}
  args: --timeout=10m
 
  license-headers-linter:

cmd/apprepository-controller/Dockerfile

@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.22.5 AS builder
+FROM bitnami/golang:1.23.2 AS builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 COPY pkg pkg
@@ -14,7 +14,7 @@ ARG VERSION
 ARG lint
 
 # https://github.com/golangci/golangci-lint/releases
-ARG GOLANGCILINT_VERSION="1.59.1"
+ARG GOLANGCILINT_VERSION="1.61.0"
 
 RUN if [ ! -z ${lint:-} ]; then \
  go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILINT_VERSION && \

cmd/apprepository-controller/server/controller.go

@@ -390,7 +390,7 @@ func (c *Controller) syncHandler(key string) error {
  if !metav1.IsControlledBy(cronjob, apprepo) && !objectBelongsTo(cronjob, apprepo) {
  msg := fmt.Sprintf(messageResourceExists, cronjob.GetName())
  c.recorder.Event(apprepo, corev1.EventTypeWarning, errResourceExists, msg)
- return fmt.Errorf(msg)
+ return fmt.Errorf("%s", msg)
  }
 
  if apprepo.GetNamespace() == c.conf.KubeappsNamespace {

cmd/asset-syncer/Dockerfile

@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.22.5 AS builder
+FROM bitnami/golang:1.23.2 AS builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 COPY pkg pkg
@@ -14,7 +14,7 @@ ARG VERSION
 ARG lint
 
 # https://github.com/golangci/golangci-lint/releases
-ARG GOLANGCILINT_VERSION="1.59.1"
+ARG GOLANGCILINT_VERSION="1.61.0"
 
 RUN if [ ! -z ${lint:-} ]; then \
  go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANGCILINT_VERSION && \

cmd/asset-syncer/server/utils_test.go

@@ -2059,7 +2059,7 @@ func TestOrderedChartVersions(t *testing.T) {
  orderedChartVersions(chartVersions)
 
  if !cmp.Equal(chartVersions, tc.expected) {
- t.Errorf(cmp.Diff(tc.expected, chartVersions))
+ t.Errorf("%s", cmp.Diff(tc.expected, chartVersions))
  }
  })
  }

cmd/kubeapps-apis/Dockerfile

@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM bitnami/golang:1.22.5 AS builder
+FROM bitnami/golang:1.23.2 AS builder
 WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
 COPY go.mod go.sum ./
 ARG VERSION="devel"
@@ -13,13 +13,13 @@ ARG TARGETARCH
 ARG lint
 
 # https://github.com/bufbuild/buf/releases/
-ARG BUF_VERSION="1.34.0"
+ARG BUF_VERSION="1.45.0"
 
 # https://github.com/golangci/golangci-lint/releases
-ARG GOLANGCILINT_VERSION="1.59.1"
+ARG GOLANGCILINT_VERSION="1.61.0"
 
 # https://github.com/grpc-ecosystem/grpc-health-probe/releases/
-ARG GRPC_HEALTH_PROBE_VERSION="0.4.28"
+ARG GRPC_HEALTH_PROBE_VERSION="0.4.34"
 
 # Install lint tools
 RUN if [ ! -z ${lint:-} ]; then \

cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/watcher_cache.go

@@ -515,7 +515,7 @@ func (c *NamespacedResourceWatcherCache) processOneEvent(event watch.Event) {
  } else {
  sb.WriteString(fmt.Sprintf("\n[%s]", common.PrettyPrint(event.Object)))
  }
- log.Infof(sb.String())
+ log.Info(sb.String())
 
  switch event.Type {
  case watch.Added, watch.Modified, watch.Deleted:

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go

@@ -947,7 +947,7 @@ func (s *Server) fetchChartWithRegistrySecrets(ctx context.Context, headers http
  var tarballURL string
  // If the chart is cached, we can use the tarball URL from the cache,
  // we assume cachedChart.ChartVersions only contains 1 element
- if cachedChart.ChartVersions != nil && len(cachedChart.ChartVersions) == 1 && cachedChart.ChartVersions[0].URLs != nil {
+ if len(cachedChart.ChartVersions) == 1 && cachedChart.ChartVersions[0].URLs != nil {
  tarballURL = chartTarballURL(cachedChart.Repo, cachedChart.ChartVersions[0])
  log.InfoS("Using chart tarball", "url", tarballURL)
  }

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/utils/postgresql_utils.go

@@ -221,7 +221,7 @@ func (m *PostgresAssetManager) GenerateWhereClause(cq ChartQuery) (string, []int
  whereClauses = append(whereClauses, fmt.Sprintf("(info->'chartVersions' @> $%d::jsonb)", len(whereQueryParams)))
  }
 
- if cq.Repos != nil && len(cq.Repos) > 0 {
+ if len(cq.Repos) > 0 {
  repoClauses := []string{}
  for _, repo := range cq.Repos {
  if repo != "" {
@@ -234,7 +234,7 @@ func (m *PostgresAssetManager) GenerateWhereClause(cq ChartQuery) (string, []int
  whereClauses = append(whereClauses, repoQuery)
  }
  }
- if cq.Categories != nil && len(cq.Categories) > 0 {
+ if len(cq.Categories) > 0 {
  categoryClauses := []string{}
  for _, category := range cq.Categories {
  if category != "" {

cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go

@@ -314,7 +314,7 @@ func (s *Server) buildInstalledPackageDetail(pkgInstall *packagingv1alpha1.Packa
  installedPackageDetail.ReconciliationOptions.Interval = pkgutils.FromDuration(app.Spec.SyncPeriod)
  }
 
- if pkgInstall.Status.Conditions != nil && len(pkgInstall.Status.Conditions) > 0 {
+ if len(pkgInstall.Status.Conditions) > 0 {
  installedPackageDetail.Status = &corev1.InstalledPackageStatus{
  Ready: pkgInstall.Status.Conditions[0].Type == kappctrlv1alpha1.ReconcileSucceeded,
  Reason: statusReasonForKappStatus(pkgInstall.Status.Conditions[0].Type),

cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils.go

@@ -153,7 +153,7 @@ func IsValidChart(chart *models.Chart) (bool, error) {
  if chart.Repo == nil {
  return false, connect.NewError(connect.CodeInternal, fmt.Errorf("Required field .Repo not found on helm chart: %v", chart))
  }
- if chart.ChartVersions == nil || len(chart.ChartVersions) == 0 {
+ if len(chart.ChartVersions) == 0 {
  return false, connect.NewError(connect.CodeInternal, fmt.Errorf("Required field .chart.ChartVersions not found on helm chart or is empty: %v", chart))
  } else {
  for _, chartVersion := range chart.ChartVersions {

cmd/oci-catalog/Dockerfile

@@ -3,14 +3,14 @@
 
 # syntax = docker/dockerfile:1
 
-FROM rust:1.79.0 AS builder
+FROM rust:1.81.0 AS builder
 
 WORKDIR /oci-catalog
 ARG VERSION="devel"
 ARG TARGETARCH
 
 # https://github.com/grpc-ecosystem/grpc-health-probe/releases/
-ARG GRPC_HEALTH_PROBE_VERSION="0.4.28"
+ARG GRPC_HEALTH_PROBE_VERSION="0.4.34"
 
 # Ensure protoc is available for the build.rs step.
 RUN apt-get update && apt-get -y install --no-install-recommends protobuf-compiler && rm -rf /var/lib/apt/lists/*

cmd/pinniped-proxy/Dockerfile

@@ -3,7 +3,7 @@
 
 # syntax = docker/dockerfile:1
 
-FROM rust:1.79.0 AS builder
+FROM rust:1.81.0 AS builder
 
 WORKDIR /pinniped-proxy
 ARG VERSION

dashboard/Dockerfile

@@ -1,7 +1,7 @@
 # Copyright 2018-2024 the Kubeapps contributors.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM bitnami/node:20.15.1 AS build
+FROM bitnami/node:20.18.0 AS build
 WORKDIR /app
 
 COPY package.json yarn.lock /app/
@@ -12,5 +12,5 @@ COPY . /app
 RUN yarn run prettier-check && yarn run ts-compile-check
 RUN yarn run build
 
-FROM bitnami/nginx:1.27.0
+FROM bitnami/nginx:1.27.2
 COPY --from=build /app/build /app

pkg/http-client/httpclient.go

@@ -209,7 +209,7 @@ func GetStream(url string, cli *http.Client, reqHeaders map[string]string) (io.R
  if err == nil && len(errPayload) > 0 {
  errorMsg += ": " + string(errPayload)
  }
- return nil, respContentType, fmt.Errorf(errorMsg)
+ return nil, respContentType, fmt.Errorf("%s", errorMsg)
  }
 
  return res.Body, respContentType, nil

script/lib/libcitools.sh

@@ -111,7 +111,7 @@ function installKubectl() {
 
  info "Installing Kubectl ${KUBECTL_VERSION}"
  pushd /tmp
- curl -LO https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+ curl -LO https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
  chmod +x ./kubectl
  sudo mv ./kubectl /usr/local/bin/kubectl
  popd