Skip to content

Kube 1.16 #400

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.

Sign up for GitHub

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

Closed
wants to merge 5 commits into from
Closed

Kube 1.16 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8c4dcb
Revendor with go mod
enxebre Sep 18, 2019
c348b80
Move automation from dep to go modules
enxebre Sep 19, 2019
9cfa6b0
Mirror generate-groups.sh to satisfy make generate
enxebre Sep 30, 2019
4a474f9
Revendor for kube 1.16
enxebre Sep 30, 2019
3d1024f
Update gen-crd to work with latest code-generator
enxebre Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,292 changes: 0 additions & 1,292 deletions Gopkg.lock
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

18 changes: 16 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ VERSION ?= $(shell git describe --always --abbrev=7)
MUTABLE_TAG ?= latest
IMAGE = $(REGISTRY)machine-api-operator

# Enable go modules and vendoring
# https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support
# https://github.com/golang/go/wiki/Modules#how-do-i-use-vendoring-with-modules-is-vendoring-going-away
GO111MODULE = on
export GO111MODULE
GOFLAGS ?= -mod=vendor
export GOFLAGS

ifeq ($(DBG),1)
GOGCFLAGS ?= -gcflags=all="-N -l"
endif
Expand All @@ -16,10 +24,16 @@ ifeq ($(NO_DOCKER), 1)
DOCKER_CMD =
IMAGE_BUILD_CMD = imagebuilder
else
DOCKER_CMD := docker run --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.12
DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE) --env GOFLAGS=$(GOFLAGS) --rm -v "$(PWD)":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.12
IMAGE_BUILD_CMD = docker build
endif

.PHONY: vendor
vendor:
go mod tidy
go mod vendor
go mod verify

.PHONY: check
check: lint fmt vet verify-codegen check-pkg test ## Run code validations

Expand Down Expand Up @@ -85,7 +99,7 @@ deploy-kubemark:
.PHONY: test
test: ## Run tests
@echo -e "\033[32mTesting...\033[0m"
$(DOCKER_CMD) go test ./...
$(DOCKER_CMD) go test ./pkg/... ./cmd/...

.PHONY: image
image: ## Build docker image
Expand Down
54 changes: 54 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
module github.com/openshift/machine-api-operator

go 1.12

require (
github.com/blang/semver v3.5.1+incompatible
github.com/ghodss/yaml v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega v1.5.0
github.com/openshift/api v3.9.1-0.20190517100836-d5b34b957e91+incompatible
github.com/openshift/client-go v0.0.0-20190617165122-8892c0adc000
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190904193718-8250b456dec7
github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20190521201101-62768a6ba480
github.com/openshift/cluster-version-operator v3.11.1-0.20190629164025-08cac1c02538+incompatible
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
github.com/prometheus/client_golang v1.0.0
github.com/spf13/cobra v0.0.5
github.com/stretchr/testify v1.3.0
gonum.org/v1/gonum v0.0.0-20190915125329-975d99cd20a9 // indirect
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
k8s.io/klog v0.4.0
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
sigs.k8s.io/controller-runtime v0.2.0-beta.2
sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
)

replace gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7

replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2

replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a

replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b

// pinning to kubernetes-1.16.0

replace k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f

replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269

// Pinning to origin-4.3-kubernetes-1.16.0

replace k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes-apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783

replace k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20190913080033-27d36303b655

replace k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20190918160344-1fbdaa4c8d90

replace k8s.io/kube-aggregator => github.com/openshift/kubernetes-kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
Loading