Skip to content

Crd #81

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

Merged
openshift-merge-robot merged 15 commits into from
Oct 24, 2018
Merged

Crd #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c92ffa3
comment uncompatible libs for crs revendor
enxebre Oct 17, 2018
be2001a
revendor for CRDs
enxebre Oct 17, 2018
69d1882
add kubebuilder generated skeleton
enxebre Oct 17, 2018
b4dd7a0
drop old machine controller and build new one
enxebre Oct 17, 2018
9d5de45
move provider config for new layout
enxebre Oct 17, 2018
ea4fb15
update actuator for using new provider config
enxebre Oct 17, 2018
0fc1b81
update docker and Makefile
enxebre Oct 17, 2018
a0d06f7
fix lints
enxebre Oct 17, 2018
7bc2a82
move to use manager controller runtime client and fix unit tests
enxebre Oct 17, 2018
3c07079
revendor for testing framework
enxebre Oct 18, 2018
8f6668c
re enable testing framework
enxebre Oct 18, 2018
1fb525f
revendor for cluster api 2d88aef
enxebre Oct 19, 2018
63beccd
use flag instead of pflag
enxebre Oct 19, 2018
a023a30
use Update() instead of Status.Update() as CustomResourceSubresources…
enxebre Oct 19, 2018
261db4a
Merge pull request #67 from enxebre/crds
openshift-merge-robot Oct 19, 2018
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
35 changes: 35 additions & 0 deletions 0001-use-Update-instead-of-Status.Update-as-CustomResourc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 16531c16bfa5030bb5f85d75f20353eeff46ba25 Mon Sep 17 00:00:00 2001
From: Enxebre <[email protected]>
Date: Fri, 19 Oct 2018 09:51:27 +0200
Subject: [PATCH] use Update() instead of Status.Update() as
CustomResourceSubresources might not be enable

---
vendor/sigs.k8s.io/cluster-api/pkg/controller/node/node.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/sigs.k8s.io/cluster-api/pkg/controller/node/node.go b/vendor/sigs.k8s.io/cluster-api/pkg/controller/node/node.go
index cb16730b..f1a4bff3 100644
--- a/vendor/sigs.k8s.io/cluster-api/pkg/controller/node/node.go
+++ b/vendor/sigs.k8s.io/cluster-api/pkg/controller/node/node.go
@@ -75,7 +75,7 @@ func (c *ReconcileNode) link(node *corev1.Node) error {
t := metav1.Now()
machine.Status.LastUpdated = &t
machine.Status.NodeRef = objectRef(node)
- if err = c.Client.Status().Update(context.Background(), machine); err != nil {
+ if err = c.Client.Update(context.Background(), machine); err != nil {
glog.Errorf("Error updating machine to link to node: %v\n", err)
} else {
glog.Infof("Successfully linked machine %s to node %s\n",
@@ -121,7 +121,7 @@ func (c *ReconcileNode) unlink(node *corev1.Node) error {
t := metav1.Now()
machine.Status.LastUpdated = &t
machine.Status.NodeRef = nil
- if err = c.Client.Status().Update(context.Background(), machine); err != nil {
+ if err = c.Client.Update(context.Background(), machine); err != nil {
glog.Errorf("Error updating machine %s to unlink node %s: %v\n",
machine.ObjectMeta.Name, node.ObjectMeta.Name, err)
} else {
--
2.15.2 (Apple Git-101.1)

11 changes: 7 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
# This expects that the context passed to the docker build command is
# the cluster-api-provider-aws directory.
# e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api-aws>
COPY . .
COPY pkg/ pkg/
COPY cmd/ cmd/
COPY vendor/ vendor/

RUN GOPATH="/go" CGO_ENABLED=0 GOOS=linux go install -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/machine-controller
RUN GOPATH="/go" CGO_ENABLED=0 GOOS=linux go install -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/vendor/sigs.k8s.io/cluster-api/cmd/controller-manager

RUN GOPATH="/go" CGO_ENABLED=0 GOOS=linux go build -o /go/bin/machine-controller-manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/manager
RUN GOPATH="/go" CGO_ENABLED=0 GOOS=linux go build -o /go/bin/manager -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/vendor/sigs.k8s.io/cluster-api/cmd/manager

# Final container
FROM openshift/origin-base
RUN yum install -y ca-certificates openssh

COPY --from=builder /go/bin/machine-controller /go/bin/controller-manager .
COPY --from=builder /go/bin/manager /go/bin/machine-controller-manager /
Loading