Skip to content

Commit

Permalink
Merge pull request #35 from ArangoGutierrez/1868294
Browse files Browse the repository at this point in the history
Update to k8's 1.19
  • Loading branch information
k8s-ci-robot authored Nov 10, 2020
2 parents 41a3671 + 2d8049f commit 8ea3ef2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the operator
FROM golang:1.14.7 AS builder
FROM golang:1.15.4 AS builder
WORKDIR /go/src/github.com/kubernetes-sigs/node-feature-discovery-operator

# Fetch/cache dependencies
Expand Down
25 changes: 13 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
module github.com/kubernetes-sigs/node-feature-discovery-operator

go 1.14
go 1.15

require (
github.com/go-logr/logr v0.3.0
github.com/go-logr/zapr v0.3.0
github.com/go-openapi/spec v0.19.3
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/googleapis/gnostic v0.4.1
github.com/imdario/mergo v0.3.7 // indirect
github.com/openshift/api v0.0.0-20200116145750-0e2ff1e215dd
github.com/operator-framework/operator-sdk v0.4.1-0.20190129222657-43d37ce85826
golang.org/x/text v0.3.3 // indirect
// Kubernetes 1.17
k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver v0.17.3 // indirect
k8s.io/apimachinery v0.17.3
k8s.io/client-go v0.17.3
k8s.io/kube-openapi v0.0.0
sigs.k8s.io/controller-runtime v0.4.0
// Kubernetes 1.19
k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver v0.19.0 // indirect
k8s.io/apimachinery v0.19.0
k8s.io/client-go v0.19.0
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 // kube-openapi release-1.9 branch
sigs.k8s.io/controller-runtime v0.6.3
)

replace (
k8s.io/client-go => k8s.io/client-go v0.17.3
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
)
replace k8s.io/client-go => k8s.io/client-go v0.19.0

0 comments on commit 8ea3ef2

Please sign in to comment.