Skip to content

Commit

Permalink
Merge pull request #212 from h3poteto/k8s/1.22
Browse files Browse the repository at this point in the history
Update k8s libraries version to 1.22
  • Loading branch information
h3poteto committed Jan 24, 2022
2 parents 2d7d3a7 + c269fc4 commit 3758cc4
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
k8s-version: [1.20.7, 1.21.2, 1.22.4]
k8s-version: [1.21.2, 1.22.4, 1.23.1]

steps:
- uses: actions/setup-go@v2
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ else
GOBIN=$(shell go env GOBIN)
endif

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

build: codegen manifests
Expand Down
2 changes: 1 addition & 1 deletion config/crd/operator.h3poteto.dev_sidecarinjectors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: sidecarinjectors.operator.h3poteto.dev
spec:
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ require (
github.com/spf13/cobra v1.3.0
github.com/spf13/viper v1.10.1
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.21.8
k8s.io/apimachinery v0.21.8
k8s.io/client-go v0.21.8
k8s.io/api v0.22.6
k8s.io/apimachinery v0.22.6
k8s.io/client-go v0.22.6
k8s.io/klog/v2 v2.40.1
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
)
Loading

0 comments on commit 3758cc4

Please sign in to comment.