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

Bug 1879854: Bump vendor dependencies to k8s 1.19.0 #154

Merged
merged 2 commits into from
Sep 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder
WORKDIR /go/src/github.com/openshift/cluster-node-tuning-operator
COPY . .
RUN make build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.15 AS builder
WORKDIR /go/src/github.com/openshift/cluster-node-tuning-operator
COPY . .
RUN make build
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ pkg/generated: $(API_TYPES)
touch $@

crd-schema-gen:
$(GO) run ./vendor/github.com/openshift/crd-schema-gen/cmd/crd-schema-gen/ --apis-dir pkg/apis --manifests-dir manifests/
jmencak marked this conversation as resolved.
Show resolved Hide resolved
# TODO: look into using https://github.com/openshift/build-machinery-go/ and yaml patches
$(GO) run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/ schemapatch:manifests=./manifests paths=./pkg/apis/tuned/v1 output:dir=./manifests

$(GOBINDATA_BIN):
$(GO) build -o $(GOBINDATA_BIN) ./vendor/github.com/kevinburke/go-bindata/go-bindata
Expand Down
74 changes: 36 additions & 38 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,59 +1,57 @@
module github.com/openshift/cluster-node-tuning-operator

go 1.13
go 1.15

require (
github.com/coreos/ignition v0.35.0 // indirect
github.com/coreos/ignition/v2 v2.4.1
github.com/kevinburke/go-bindata v3.16.0+incompatible
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
github.com/openshift/crd-schema-gen v1.0.0
github.com/openshift/library-go v0.0.0-20200331103725-0ea6ba4792fa
github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7 // indirect
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/crd-schema-gen v1.0.0 // indirect
github.com/openshift/library-go v0.0.0-20200911100307-610c6e9e90b8
github.com/openshift/machine-config-operator v4.2.0-alpha.0.0.20190917115525-033375cbe820+incompatible
github.com/pkg/errors v0.9.1
github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50 // indirect
golang.org/x/text v0.3.3 // indirect
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
k8s.io/code-generator v0.18.0
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/client-go v0.19.0
k8s.io/code-generator v0.19.0
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
sigs.k8s.io/controller-tools v0.2.2 // indirect
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/controller-tools v0.4.0
)

// Pinned to kubernetes-1.18.0
// Pinned to kubernetes-1.19.0
replace (
k8s.io/api => k8s.io/api v0.18.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
k8s.io/apiserver => k8s.io/apiserver v0.18.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
k8s.io/client-go => k8s.io/client-go v0.18.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
k8s.io/code-generator => k8s.io/code-generator v0.18.0
k8s.io/component-base => k8s.io/component-base v0.18.0
k8s.io/cri-api => k8s.io/cri-api v0.18.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
k8s.io/kubectl => k8s.io/kubectl v0.18.0
k8s.io/kubelet => k8s.io/kubelet v0.18.0
k8s.io/kubernetes => k8s.io/kubernetes v1.18.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
k8s.io/metrics => k8s.io/metrics v0.18.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/apiserver => k8s.io/apiserver v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0
k8s.io/code-generator => k8s.io/code-generator v0.19.0
k8s.io/component-base => k8s.io/component-base v0.19.0
k8s.io/cri-api => k8s.io/cri-api v0.19.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
k8s.io/kubelet => k8s.io/kubelet v0.19.0
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0
k8s.io/metrics => k8s.io/metrics v0.19.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0
)

// Other pinned deps
replace (
github.com/go-log/log => github.com/go-log/log v0.1.0
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200618004043-7b1eb84e0083 // release-4.5
)
replace github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9 // 4.6 as of 2020-09-15