Skip to content

Commit

Permalink
Merge pull request #204 from h3poteto/k8s/1.21
Browse files Browse the repository at this point in the history
Update k8s libraries version to 1.21
  • Loading branch information
h3poteto committed Jan 3, 2022
2 parents f1ce6cd + 141db0e commit 56263b3
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.16.0'
- uses: actions/checkout@master
- name: Testing
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.16.0'
- uses: actions/checkout@master
- name: Install kind
env:
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
@@ -0,0 +1 @@
golang 1.16.12
6 changes: 4 additions & 2 deletions Makefile
Expand Up @@ -9,8 +9,8 @@ endif

CRD_OPTIONS ?= "crd:trivialVersions=true"
CODE_GENERATOR=${GOPATH}/src/k8s.io/code-generator
CODE_GENERATOR_TAG=v0.20.11
CONTROLLER_TOOLS_TAG=v0.5.0
CODE_GENERATOR_TAG=v0.21.8
CONTROLLER_TOOLS_TAG=v0.6.1
BRANCH := $(shell git branch --show-current)

build: codegen manifests
Expand All @@ -28,6 +28,8 @@ uninstall: manifests
clean:
rm -f ./*.crt
rm -f ./*.key
rm -f $(GOBIN)/controller-gen
rm -rf $(CODE_GENERATOR)

codegen: code-generator
${CODE_GENERATOR}/generate-groups.sh "deepcopy,client,informer,lister" \
Expand Down
2 changes: 1 addition & 1 deletion config/crd/operator.h3poteto.dev_sidecarinjectors.yaml
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: sidecarinjectors.operator.h3poteto.dev
spec:
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Expand Up @@ -11,9 +11,9 @@ require (
github.com/spf13/cobra v1.1.3
github.com/spf13/viper v1.7.1
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/klog/v2 v2.8.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
k8s.io/api v0.21.8
k8s.io/apimachinery v0.21.8
k8s.io/client-go v0.21.8
k8s.io/klog/v2 v2.30.0
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
)
62 changes: 34 additions & 28 deletions go.sum

Large diffs are not rendered by default.

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

0 comments on commit 56263b3

Please sign in to comment.