Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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.13 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder
WORKDIR /go/src/github.com/openshift/machine-config-operator
COPY . .
# FIXME once we can depend on a new enough host that supports globs for COPY,
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/machine-config-operator

go 1.13
go 1.15

require (
github.com/BurntSushi/toml v0.3.1
Expand Down Expand Up @@ -60,6 +60,7 @@ require (
k8s.io/code-generator v0.19.2
k8s.io/kubectl v0.0.0-20201023045331-0a68e0d30fe9
k8s.io/kubelet v0.19.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
)

replace (
Expand Down
37 changes: 0 additions & 37 deletions machine-config-daemon.spec

This file was deleted.

Empty file modified vendor/k8s.io/code-generator/generate-groups.sh
100644 → 100755
Empty file.
Empty file modified vendor/k8s.io/code-generator/generate-internal-groups.sh
100644 → 100755
Empty file.
Loading