Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

Commit

Permalink
go/deps: update Helm to v3.7.0 and kubernetes packages
Browse files Browse the repository at this point in the history
Updates Helm to v3.7.0 which is a feature release. The previous
Helm version, v3.6.1 was dependent on a version of containerd that
required a bug fix. Helm needed to be updated to a version that
included the fixed containerd pkg. As a result, the kubernetes
packages are updated to v0.22.1. Also includes codchanges
resulting from upgrading the pkg versions.

Signed-off-by: jaellio <[email protected]>
  • Loading branch information
jaellio committed Oct 7, 2021
1 parent 33336c6 commit db5d919
Show file tree
Hide file tree
Showing 26 changed files with 856 additions and 491 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup Go 1.16
uses: actions/setup-go@v1
with:
go-version: 1.16
- name: go mod tidy
run: make go-mod-tidy
- name: gomock checks
run: make check-mocks

Expand Down Expand Up @@ -134,6 +140,8 @@ jobs:
uses: actions/setup-go@v1
with:
go-version: 1.16
- name: go mod tidy
run: make go-mod-tidy
- name: Test
run: make go-test-coverage
- name: Upload Coverage
Expand Down
2 changes: 1 addition & 1 deletion codegen/gen-crd-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ROOT_PACKAGE="github.com/openservicemesh/osm"
ROOT_DIR="$(git rev-parse --show-toplevel)"

# get code-generator version from go.sum
CODEGEN_VERSION="v0.21.1" # Must match k8s.io/client-go version defined in go.mod
CODEGEN_VERSION="v0.22.1" # Must match k8s.io/client-go version defined in go.mod
CODEGEN_PKG="$(echo `go env GOPATH`/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION})"

echo ">>> using codegen: ${CODEGEN_PKG}"
Expand Down
29 changes: 14 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ require (
github.com/envoyproxy/go-control-plane v0.9.9
github.com/fatih/color v1.10.0
github.com/ghodss/yaml v1.0.0
github.com/golang/mock v1.4.1
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.5.2
github.com/golangci/golangci-lint v1.32.2
github.com/google/go-cmp v0.5.6
github.com/google/uuid v1.1.2
github.com/gorilla/mux v1.7.3
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-version v1.2.0
github.com/hashicorp/vault/api v1.0.4
github.com/jetstack/cert-manager v1.3.1
Expand All @@ -30,7 +30,7 @@ require (
github.com/mitchellh/hashstructure/v2 v2.0.1
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
github.com/norwoodj/helm-docs v1.4.0
github.com/olekukonko/tablewriter v0.0.4
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
Expand All @@ -39,26 +39,25 @@ require (
github.com/prometheus/common v0.26.0
github.com/rs/zerolog v1.18.0
github.com/servicemeshinterface/smi-sdk-go v0.5.0
github.com/spf13/cobra v1.1.3
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/objx v0.3.0 // indirect
github.com/stretchr/testify v1.7.0
golang.org/x/tools v0.1.1-0.20210319172145-bda8f5cee399 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0
google.golang.org/grpc v1.36.0
google.golang.org/grpc v1.38.0
google.golang.org/protobuf v1.26.0
gopkg.in/yaml.v2 v2.4.0
gorm.io/driver/mysql v1.1.1
gorm.io/gorm v1.21.12
helm.sh/helm/v3 v3.6.1
helm.sh/helm/v3 v3.7.0
honnef.co/go/tools v0.1.1 // indirect
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/cli-runtime v0.21.1
k8s.io/client-go v0.21.1
k8s.io/code-generator v0.21.1
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/cli-runtime v0.22.1
k8s.io/client-go v0.22.1
k8s.io/code-generator v0.22.1
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
mvdan.cc/gofumpt v0.1.0 // indirect
sigs.k8s.io/controller-runtime v0.9.0
sigs.k8s.io/kind v0.11.1
Expand Down
798 changes: 575 additions & 223 deletions go.sum

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions pkg/catalog/mock_catalog_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit db5d919

Please sign in to comment.