Skip to content

Commit

Permalink
Merge branch 'main' into k8s-client-go
Browse files Browse the repository at this point in the history
  • Loading branch information
castelblanque authored Sep 28, 2022
2 parents eccf4f9 + d1b83d6 commit 8c7bdba
Show file tree
Hide file tree
Showing 57 changed files with 2,707 additions and 1,984 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ version: 2.1
parameters:
GOLANG_VERSION:
type: string
default: "1.19.0"
default: "1.19.1"
NODE_VERSION:
type: string
default: "16.17.0"
default: "16.17.1"
RUST_VERSION:
type: string
default: "1.63.0"
default: "1.64.0"
DOCKER_VERSION:
type: string
default: "20.10.14"
default: "20.10.17"
DOCKER_REGISTRY_VERSION:
type: string
default: "2.8.1"
Expand All @@ -23,7 +23,7 @@ parameters:
default: "v3.2.0"
HELM_VERSION_STABLE:
type: "string"
default: "v3.9.4"
default: "v3.10.0"
OLM_VERSION:
type: "string"
default: "v0.22.0"
Expand All @@ -32,31 +32,31 @@ parameters:
default: "3.9.0"
KAPP_CONTROLLER_VERSION:
type: "string"
default: "v0.40.0"
default: "v0.41.2"
MKCERT_VERSION:
type: "string"
default: "v1.4.4"
KUBECTL_VERSION:
type: "string"
default: "v1.24.3"
default: "v1.24.6"
GITHUB_VERSION:
type: "string"
default: "2.14.7"
default: "2.16.1"
SEMVER_VERSION:
type: "string"
default: "3.3.0"
KIND_VERSION:
type: "string"
default: "v0.15.0"
default: "v0.16.0"
K8S_KIND_VERSION:
type: "string"
default: "v1.22.13@sha256:4904eda4d6e64b402169797805b8ec01f50133960ad6c19af45173a27eadf959"
default: "v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586"
POSTGRESQL_VERSION:
type: "string"
default: "14.5.0-debian-11-r6"
default: "14.5.0-debian-11-r14"
GKE_STABLE_VERSION:
type: "string"
default: "1.21"
default: "1.22"
GKE_REGULAR_VERSION:
type: "string"
default: "1.22"
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
# Known issue for go 1.18 support in codeql-go
# ref https://bytemeta.vip/repo/github/codeql-action/issues/1059?page=2
continue-on-error: true
permissions:
actions: read
contents: read
Expand All @@ -31,6 +34,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
if: ${{ matrix.language == 'go' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion cmd/apprepository-controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# syntax = docker/dockerfile:1

FROM bitnami/golang:1.19.0 as builder
FROM bitnami/golang:1.19.1 as builder
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/asset-syncer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# syntax = docker/dockerfile:1

FROM bitnami/golang:1.19.0 as builder
FROM bitnami/golang:1.19.1 as builder
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/asset-syncer/server/postgresql_db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Currently these tests will be skipped entirely unless the
// ENABLE_PG_INTEGRATION_TESTS env var is set.
// Run the local postgres with
// docker run --publish 5432:5432 -e ALLOW_EMPTY_PASSWORD=yes bitnami/postgresql:14.5.0-debian-11-r6
// docker run --publish 5432:5432 -e ALLOW_EMPTY_PASSWORD=yes bitnami/postgresql:14.5.0-debian-11-r14
// in another terminal.
package server

Expand Down
4 changes: 2 additions & 2 deletions cmd/kubeapps-apis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

# syntax = docker/dockerfile:1

FROM bitnami/golang:1.19.0 as builder
FROM bitnami/golang:1.19.1 as builder
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
COPY go.mod go.sum ./
ARG VERSION="devel"

ARG BUF_VERSION="1.7.0"
ARG BUF_VERSION="1.8.0"
ARG GOLANGCILINT_VERSION="1.49.0"

# Install lint tools
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeapps-apis/buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ deps:
- remote: buf.build
owner: googleapis
repository: googleapis
commit: 62f35d8aed1149c291d606d958a7ce32
commit: e9fcfb66f77242e5b8fd4564d7a01033
- remote: buf.build
owner: grpc-ecosystem
repository: grpc-gateway
Expand Down
718 changes: 397 additions & 321 deletions cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.go

Large diffs are not rendered by default.

Loading

0 comments on commit 8c7bdba

Please sign in to comment.