Merge pull request #101 from adambkaplan/rebase-1.14

Rebase to 1.14.0
openshift · May 30, 2019 · b01fb05 · b01fb05
2 parents 657c2cf + 198a5a0
commit b01fb05
Show file tree

Hide file tree

Showing 3,600 changed files with 102,861 additions and 359,627 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
 COPY . .
 RUN go build ./cmd/cluster-openshift-controller-manager-operator

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-openshift-controller-manager-operator
 COPY . .
 RUN go build ./cmd/cluster-openshift-controller-manager-operator

diff --git a/cmd/cluster-openshift-controller-manager-operator/main.go b/cmd/cluster-openshift-controller-manager-operator/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	utilflag "k8s.io/apiserver/pkg/util/flag"
-	"k8s.io/apiserver/pkg/util/logs"
+	utilflag "k8s.io/component-base/cli/flag"
+	"k8s.io/component-base/logs"
 
 	"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/cmd/operator"
 )