Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #4121

Merged
merged 34 commits into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cef78c3
Update dockerfiles
antgamdia Jan 19, 2022
88cf9df
Update integration deps and image
antgamdia Jan 19, 2022
0ac5114
Update chart deps
antgamdia Jan 19, 2022
21c665c
Update buf deps
antgamdia Jan 19, 2022
3a22a43
Update versions used in CI
antgamdia Jan 19, 2022
eda6d9d
Update rust deps
antgamdia Jan 19, 2022
1c3e624
Merge branch 'master' into depUpgrades
antgamdia Jan 19, 2022
f4149d2
Update go deps
antgamdia Jan 19, 2022
56b2ba9
Merge branch 'master' into depUpgrades
antgamdia Jan 19, 2022
b312423
Update circle ci deps
antgamdia Jan 19, 2022
9bc7ed5
Update circle ci deps
antgamdia Jan 19, 2022
6ec5fcf
Merge branch 'master'
antgamdia Jan 20, 2022
3410c51
Update frontend deps
antgamdia Jan 20, 2022
9b6329e
Revert yarn upgrade
antgamdia Jan 20, 2022
07edee4
Use react-router-dom when possible
antgamdia Jan 20, 2022
984ae06
Merge branch 'useReactRouterDom' into depUpgrades
antgamdia Jan 20, 2022
94069c3
Remove unused type pkgs
antgamdia Jan 20, 2022
94eaa3f
Run yarn upgrade
antgamdia Jan 20, 2022
ba1b99e
Merge branch 'master'
antgamdia Jan 24, 2022
d283334
Update negroni dep to v2
antgamdia Jan 24, 2022
d94b9a7
Upgrade go deps
antgamdia Jan 24, 2022
eafbd38
Upgrade dashboard deps
antgamdia Jan 24, 2022
1994a89
Upgrade integration deps
antgamdia Jan 24, 2022
14d2481
Update code-generator to `release-1.22`
antgamdia Jan 24, 2022
b5b1806
Merge branch 'main'
antgamdia Jan 24, 2022
9e4ba2e
Update ci deps
antgamdia Jan 25, 2022
93d763f
Merge branch 'main'
antgamdia Jan 25, 2022
75c9d3d
Update go deps
antgamdia Jan 25, 2022
a14e5ea
Update cargo k8s-openapi default k8s version
antgamdia Jan 25, 2022
a1b2435
Update integration deps
antgamdia Jan 25, 2022
3c61129
Update dashboard deps
antgamdia Jan 25, 2022
ef25077
Update chart deps
antgamdia Jan 25, 2022
2aff797
Update buf deps + generate
antgamdia Jan 25, 2022
7e1b5d3
Update buf version
antgamdia Jan 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@ version: 2.1
parameters:
GOLANG_VERSION:
type: string
default: "1.17.3"
default: "1.17.5"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CircleCI hasn't pushed the 1.17.6 yet

NODE_VERSION:
type: string
default: "16"
RUST_VERSION:
type: string
default: "1.56.1"
default: "1.57.0"
DOCKER_VERSION:
type: string
default: "20.10.7"
default: "20.10.11"
HELM_VERSION_MIN:
type: "string"
default: "v3.1.0"
default: "v3.2.0"
HELM_VERSION_STABLE:
type: "string"
default: "v3.7.1"
default: "v3.7.2"
OLM_VERSION:
type: "string"
default: "v0.19.1"
default: "v0.20.0"
MKCERT_VERSION:
type: "string"
default: "v1.4.3"
KUBECTL_VERSION:
type: "string"
default: "v1.22.3"
default: "v1.22.5"
GITHUB_VERSION:
type: "string"
default: "2.2.0"
default: "2.4.0"
SEMVER_VERSION:
type: "string"
default: "3.2.0"
default: "3.3.0"
KIND_VERSION:
type: "string"
default: "v0.11.1"
Expand All @@ -41,7 +41,7 @@ parameters:
default: "v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
POSTGRESQL_VERSION:
type: "string"
default: "11.14.0-debian-10-r0"
default: "11.14.0-debian-10-r28"
GKE_STABLE_VERSION:
type: "string"
default: "1.20"
Expand Down
8 changes: 4 additions & 4 deletions chart/kubeapps/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 1.10.3
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.15.1
version: 10.16.1
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 15.7.4
digest: sha256:73b53342a807a168a0c4c1addce0b3a2bd60ebc291f04e324ddb6a8d21124c45
generated: "2022-01-12T09:28:21.845067896+01:00"
version: 15.7.6
digest: sha256:4d341fe5fc00958161492557838fa045357f4c9233552d8c598558b9a544f1b1
generated: "2022-01-19T12:08:08.180863464+01:00"
2 changes: 1 addition & 1 deletion cmd/apprepository-controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

FROM bitnami/golang:1.17.3 as builder
FROM bitnami/golang:1.17.6 as builder
WORKDIR /go/src/github.com/kubeapps/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/apprepository-controller/vendor/k8s.io/code-generator
Submodule code-generator updated 307 files
2 changes: 1 addition & 1 deletion cmd/asset-syncer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

FROM bitnami/golang:1.17.3 as builder
FROM bitnami/golang:1.17.6 as builder
WORKDIR /go/src/github.com/kubeapps/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 @@ -17,7 +17,7 @@ limitations under the License.
// 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:11.13.0-debian-10-r39
// docker run --publish 5432:5432 -e ALLOW_EMPTY_PASSWORD=yes bitnami/postgresql:11.14.0-debian-10-r28
// in another terminal.
package server

Expand Down
2 changes: 1 addition & 1 deletion cmd/assetsvc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

FROM bitnami/golang:1.17.3 as builder
FROM bitnami/golang:1.17.6 as builder
WORKDIR /go/src/github.com/kubeapps/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/assetsvc/pkg/utils/postgres_db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
// 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:11.13.0-debian-10-r39
// docker run --publish 5432:5432 -e ALLOW_EMPTY_PASSWORD=yes bitnami/postgresql:11.14.0-debian-10-r28
// in another terminal.
package utils

Expand Down
2 changes: 1 addition & 1 deletion cmd/assetsvc/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/heptiolabs/healthcheck"
"github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils"
"github.com/kubeapps/kubeapps/pkg/dbutils"
"github.com/urfave/negroni"
negroni "github.com/urfave/negroni/v2"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They created a tag and started using the v2 version, but there aren't any breaking changes.
However, since snyk detects a vulnerability here, I've performed this change now so that, in the future, when dependabot creates a PR, it'll be just a matter of accepting the PR)

log "k8s.io/klog/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeapps-apis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

FROM bitnami/golang:1.17.3 as builder
FROM bitnami/golang:1.17.6 as builder
WORKDIR /go/src/github.com/kubeapps/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeapps-apis/buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ plugins:
opt:
- outputClientImpl=grpc-web # client implementation it generates
- esModuleInterop=true # use imports as required in modern ts setups
- useOptionals=true # use optional TypeScript properties instead of undefined
- useOptionals=messages # use optional TypeScript properties instead of undefined
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got a deprecation message here saying true will be no longer accepted in upcoming versions. The drop-in replacement is messages as they mentioned in their docs.

# - context=true # Go-style ctx parameters # have to re-check it
# - exportCommonSymbols=false # utility types like DeepPartial wont be exported (avoid some import conflicts) # have to re-check it
6 changes: 3 additions & 3 deletions cmd/kubeapps-apis/buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ deps:
owner: googleapis
repository: googleapis
branch: main
commit: 867d9dd9b3c3471188f2f6022443c18c
digest: b1-r5E1yTfg4WtPV3sgHlE1Vwhkq-e06bTg65c6WMXyGPM=
create_time: 2021-11-25T15:03:01.772237Z
commit: c21d9ee7a8c74d6a8cce1338a2839547
digest: b1-Rdf7A_4QeTLvu6BdzORkijdmHsAyJd2MHEEZWBEUFIM=
create_time: 2022-01-15T15:04:23.382499Z
- remote: buf.build
owner: grpc-ecosystem
repository: grpc-gateway
Expand Down
40 changes: 34 additions & 6 deletions cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2610,6 +2610,13 @@
"in": "path",
"required": true,
"type": "string"
},
{
"name": "context.namespace",
"description": "Namespace. A namespace must be provided if the context of the operation is for a resource\nor resources in a particular namespace.\nFor requests to list items, not including a namespace here implies that the context\nfor the request is everything the requesting user can read, though the result can\nbe filtered by any filtering options of the request. Plugins may choose to return\nUnimplemented for some queries for which we do not yet have a need.",
"in": "query",
"required": false,
"type": "string"
}
],
"tags": [
Expand Down Expand Up @@ -2736,6 +2743,31 @@
"in": "path",
"required": true,
"type": "string"
},
{
"name": "type",
"description": "Type. The type of the secret. Valid values are defined by the Type enumeration.",
"in": "query",
"required": false,
"type": "string",
"enum": [
"SECRET_TYPE_OPAQUE_UNSPECIFIED",
"SECRET_TYPE_SERVICE_ACCOUNT_TOKEN",
"SECRET_TYPE_DOCKER_CONFIG",
"SECRET_TYPE_DOCKER_CONFIG_JSON",
"SECRET_TYPE_BASIC_AUTH",
"SECRET_TYPE_SSH_AUTH",
"SECRET_TYPE_TLS",
"SECRET_TYPE_BOOTSTRAP_TOKEN"
],
"default": "SECRET_TYPE_OPAQUE_UNSPECIFIED"
},
{
"name": "name",
"description": "Name. The name of the secret.",
"in": "query",
"required": false,
"type": "string"
}
],
"tags": [
Expand Down Expand Up @@ -2984,16 +3016,12 @@
"protobufAny": {
"type": "object",
"properties": {
"typeUrl": {
"@type": {
"type": "string",
"description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n URL, or have them precompiled into a binary to avoid any\n lookup. Therefore, binary compatibility needs to be preserved\n on changes to types. (Use versioned type names to manage\n breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics."
},
"value": {
"type": "string",
"format": "byte",
"description": "Must be a valid serialized protocol buffer of the above specified type."
}
},
"additionalProperties": {},
"description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n Foo foo = ...;\n Any any;\n any.PackFrom(foo);\n ...\n if (any.UnpackTo(\u0026foo)) {\n ...\n }\n\nExample 2: Pack and unpack a message in Java.\n\n Foo foo = ...;\n Any any = Any.pack(foo);\n ...\n if (any.is(Foo.class)) {\n foo = any.unpack(Foo.class);\n }\n\n Example 3: Pack and unpack a message in Python.\n\n foo = Foo(...)\n any = Any()\n any.Pack(foo)\n ...\n if any.Is(Foo.DESCRIPTOR):\n any.Unpack(foo)\n ...\n\n Example 4: Pack and unpack a message in Go\n\n foo := \u0026pb.Foo{...}\n any, err := anypb.New(foo)\n if err != nil {\n ...\n }\n ...\n foo := \u0026pb.Foo{}\n if err := any.UnmarshalTo(foo); err != nil {\n ...\n }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n package google.profile;\n message Person {\n string first_name = 1;\n string last_name = 2;\n }\n\n {\n \"@type\": \"type.googleapis.com/google.profile.Person\",\n \"firstName\": \u003cstring\u003e,\n \"lastName\": \u003cstring\u003e\n }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n {\n \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n \"value\": \"1.212s\"\n }"
},
"rpcStatus": {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeops/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

FROM bitnami/golang:1.17.3 as builder
FROM bitnami/golang:1.17.6 as builder
WORKDIR /go/src/github.com/kubeapps/kubeapps
COPY go.mod go.sum ./
COPY pkg pkg
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeops/internal/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kubeapps/kubeapps/pkg/kube"
"github.com/kubeapps/kubeapps/pkg/response"
log "github.com/sirupsen/logrus"
"github.com/urfave/negroni"
negroni "github.com/urfave/negroni/v2"
"helm.sh/helm/v3/pkg/action"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeops/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/kubeapps/kubeapps/pkg/auth"
backendHandlers "github.com/kubeapps/kubeapps/pkg/http-handler"
"github.com/kubeapps/kubeapps/pkg/kube"
"github.com/urfave/negroni"
negroni "github.com/urfave/negroni/v2"

log "k8s.io/klog/v2"
)
Expand Down
Loading