Skip to content

[release-4.4]Bug 1811400: Migrate to MAO #93

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
iamemilio wants to merge 3 commits into from
Closed

[release-4.4]Bug 1811400: Migrate to MAO #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8c97c8
Port CAPO to MAO API
Fedosin Apr 29, 2020
e3ab178
Use go mod
Apr 29, 2020
582a806
add context to oc.get
May 7, 2020
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
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack
COPY . .

RUN go build -o ./machine-controller-manager ./cmd/manager
RUN go build -o ./manager ./vendor/github.com/openshift/cluster-api/cmd/manager

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
RUN INSTALL_PKGS=" \
Expand All @@ -12,5 +11,5 @@ RUN INSTALL_PKGS=" \
yum install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/manager /

COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager /
5 changes: 2 additions & 3 deletions Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack
COPY . .

RUN go build -o ./machine-controller-manager ./cmd/manager
RUN go build -o ./manager ./vendor/github.com/openshift/cluster-api/cmd/manager

FROM registry.svc.ci.openshift.org/ocp/4.0:base
RUN INSTALL_PKGS=" \
Expand All @@ -12,5 +11,5 @@ RUN INSTALL_PKGS=" \
yum install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/manager /

COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager /
129 changes: 0 additions & 129 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

37 changes: 8 additions & 29 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ GOBIN_DEFAULT := $(GOPATH)/bin
export GOBIN ?= $(GOBIN_DEFAULT)
TESTARGS_DEFAULT := "-v"
export TESTARGS ?= $(TESTARGS_DEFAULT)
PKG := $(shell awk -F "\"" '/^ignored = / { print $$2 }' Gopkg.toml)
DEST := $(GOPATH)/src/$(GIT_HOST)/$(BASE_DIR)
SOURCES := $(shell find $(DEST) -name '*.go')

HAS_DEP := $(shell command -v dep;)
HAS_LINT := $(shell command -v golint;)
HAS_GOX := $(shell command -v gox;)
GOX_PARALLEL ?= 3
Expand All @@ -40,15 +38,6 @@ $(GOBIN):

work: $(GOBIN)

depend: work
ifndef HAS_DEP
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
endif
dep ensure

depend-update: work
dep ensure -update

build: manager

manager:
Expand All @@ -59,9 +48,9 @@ manager:

test: unit functional

check: depend fmt vet lint
check: fmt vet lint

unit: generate depend
unit:
go test -tags=unit $(shell go list ./...) $(TESTARGS)

functional:
Expand All @@ -80,7 +69,7 @@ endif
vet:
go vet ./...

cover: generate depend
cover:
go test -tags=unit $(shell go list ./...) -cover

docs:
Expand All @@ -104,7 +93,6 @@ env:
@echo "GOPATH: $(GOPATH)"
@echo "GOROOT: $(GOROOT)"
@echo "DEST: $(DEST)"
@echo "PKG: $(PKG)"
go version
go env

Expand All @@ -120,18 +108,9 @@ realclean: clean
shell:
$(SHELL) -i

# Generate code
generate: manifests
go generate ./pkg/... ./cmd/...

manifests:
go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd \
paths=./pkg/apis/openstackproviderconfig/... \
output:crd:dir=./config/crds

images: openstack-cluster-api-controller manifests
images: openstack-cluster-api-controller

openstack-cluster-api-controller: depend manager manifests
openstack-cluster-api-controller: manager
ifeq ($(GOOS),linux)
cp bin/manager cmd/manager
docker build -t $(REGISTRY)/openstack-cluster-api-controller:$(VERSION) cmd/manager
Expand All @@ -150,7 +129,7 @@ version:

.PHONY: build-cross
build-cross: LDFLAGS += -extldflags "-static"
build-cross: depend
build-cross:
ifndef HAS_GOX
go get -u github.com/mitchellh/gox
endif
Expand All @@ -166,5 +145,5 @@ dist: build-cross
$(DIST_DIRS) zip -r cluster-api-provider-openstack-$(VERSION)-{}.zip {} \; \
)

.PHONY: build clean cover depend docs fmt functional lint realclean \
relnotes test translation version build-cross dist manifests
.PHONY: build clean cover docs fmt functional lint realclean \
relnotes test translation version build-cross dist
4 changes: 2 additions & 2 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"flag"
"log"

clusterapis "github.com/openshift/cluster-api/pkg/apis"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
"k8s.io/klog"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/apis"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/controller"
Expand Down Expand Up @@ -61,7 +61,7 @@ func main() {
klog.Fatal(err)
}

if err := clusterapis.AddToScheme(mgr.GetScheme()); err != nil {
if err := machinev1.AddToScheme(mgr.GetScheme()); err != nil {
klog.Fatal(err)
}

Expand Down
31 changes: 31 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module sigs.k8s.io/cluster-api-provider-openstack

go 1.13

require (
github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect
github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/coreos/container-linux-config-transpiler v0.9.0
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/coreos/ignition v0.33.0 // indirect
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
github.com/gophercloud/gophercloud v0.6.1-0.20191025185032-6ad562af8c1f
github.com/gophercloud/utils v0.0.0-20190124231947-9c3b9f2457ef
github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723
github.com/openshift/machine-api-operator v0.2.1-0.20200402110321-4f3602b96da3
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb // indirect
go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.5 // indirect
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2
k8s.io/klog v1.0.0
sigs.k8s.io/controller-runtime v0.5.1-0.20200330174416-a11a908d91e0
sigs.k8s.io/controller-tools v0.3.0 // indirect
sigs.k8s.io/yaml v1.2.0
)
Loading