Migrate to CRDs - WIP #67

enxebre · 2018-10-11T14:50:50Z

Migrate to CRDs:

New api generation and layout based on kubebuilder
-- kubebuilder init --domain k8s.io --license apache2 --owner “The Kubernetes Authors”
-- kubebuilder create api --group awsproviderconfig --version v1alpha1 --kind AWSMachineProviderConfig
Move the cloud/ code from root folder into pkg/cloud
revendor
Fix machine status, provider status
Update tests/ and cmd/aws-actuator
Update docker file and Make

How to run it:
kustomize build vendor/sigs.k8s.io/cluster-api/config/default/ >> cluster-api-bootstrap.yaml
kubectl apply -f cluster-api-bootstrap.yaml
make manager
./bin/manager

How to regenerate code:
go generate ./pkg/... ./cmd/...

frobware

I took a very brief look at this; clearly a lot of WIP and just a couple of comments for now.

frobware · 2018-10-11T15:11:16Z

cmd/manager/main.go

If SIGTERM is received does Start() return? If so, I wouldn't expect that to print a fatal error.

Invoking: $ make build DBG=1 or $ make aws-actuator DBG=1 will build cmd/cluster-controller, cmd/machine-controller and bin/aws-actuator with Go debug support. The build rules for those three binaries are now `go build $(GOGCFLAGS) ...`. The default value for GOGCFLAGS is -gcflags=all="-N -l", assuming GOGCFLAGS it not already set in your environment. "all" specifies that the flags should be applied to all packages (and may rebuild existing up to date packages); "-N" disables compiler optimisations and "-l" prevents inlining. So, to override the defaults: $ make build DBG=1 GOGCFLAGS='-gcflags="-N -l"'

Makefile: add Go debug support for local binaries

unify clusterid retrieval

remove unused controllers

enxebre · 2018-10-17T21:42:29Z

/test images

ingvagabund · 2018-10-18T10:35:57Z

cmd/manager/main.go

+	log.Printf("Registering Components.")
+
+	// Setup Scheme for all resources
+	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {


This is nice.

ingvagabund · 2018-10-18T11:03:30Z

pkg/controller/add_awsmachineproviderconfig.go

+package controller
+
+import (
+	"sigs.k8s.io/cluster-api-provider-aws/migration/pkg/controller/awsmachineproviderconfig"


Where can I find this migration dir?

ingvagabund · 2018-10-18T11:06:19Z

cmd/manager/main.go

 )

+func init() {
+	pflag.CommandLine.StringVar(&logLevel, "log-level", defaultLogLevel, "Log level (debug,info,warn,error,fatal)")


We should use flag since sigs.k8s.io/controller-runtime defines its own flags which gets ignored by pflag.

ingvagabund · 2018-10-18T11:15:16Z

pkg/apis/awsproviderconfig/v1alpha1/awsmachineproviderconfig_types.go

+const (
+	// ClusterNameLabel is the label that a machineset must have to identify the
+	// cluster to which it belongs.
+	ClusterNameLabel = "sigs.k8s.io/cluster-api-cluster"


Are those labels community defined?

this is a carry over, there's bunch of things to consolidate after this. Let's address any non specific to CRDs move in different follow ups

ingvagabund · 2018-10-18T13:32:19Z

kubernetes-sigs/cluster-api#546 is definitely blocker

enxebre · 2018-10-18T16:15:22Z

/test e2e

openshift-ci-robot · 2018-10-18T16:19:08Z

@enxebre: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws	`7bc2a82`	link	`/test e2e-aws`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

ingvagabund · 2018-10-18T18:53:27Z

/retest

ingvagabund · 2018-10-18T18:55:37Z

/test e2e

… might not be enable

ingvagabund · 2018-10-19T08:19:47Z

/test e2e

ingvagabund · 2018-10-19T09:41:46Z

/approve

openshift-ci-robot · 2018-10-19T09:42:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [ingvagabund]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ingvagabund · 2018-10-19T09:45:17Z

/lgtm

* Adds simple Exists implementation to machine actuator Remove the machine actuator test for now. Trying to test it will be possible, but it will be a *ton* of work and right now it's not worth the effort. Exports the ec2 service's EC2 field. Signed-off-by: Chuck Ha <[email protected]> * Update deps Signed-off-by: Chuck Ha <[email protected]>

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 11, 2018

openshift-ci-robot requested review from ingvagabund and trawler October 11, 2018 14:51

frobware reviewed Oct 11, 2018

View reviewed changes

cmd/manager/main.go Outdated

Copy link

frobware Oct 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If SIGTERM is received does Start() return? If so, I wouldn't expect that to print a fatal error.

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 14, 2018

enxebre added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 16, 2018

enxebre force-pushed the crds branch from ab45cd7 to 89f6add Compare October 16, 2018 12:35

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 16, 2018

frobware and others added 11 commits October 16, 2018 17:52

Merge pull request kubernetes-sigs#70 from frobware/add-dbg-support

2e21063

Makefile: add Go debug support for local binaries

unify clusterid retrieval

c6efff4

Merge pull request kubernetes-sigs#74 from enxebre/clusterid

3c4b774

unify clusterid retrieval

remove unused controllers

7e0251b

Merge pull request kubernetes-sigs#75 from enxebre/controllers

1e3683b

remove unused controllers

comment uncompatible libs for crs revendor

c92ffa3

revendor for CRDs

be2001a

add kubebuilder generated skeleton

69d1882

drop old machine controller and build new one

b4dd7a0

move provider config for new layout

9d5de45

enxebre force-pushed the crds branch from 89f6add to c7d67e4 Compare October 17, 2018 11:15

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 17, 2018

enxebre changed the base branch from master to crd October 17, 2018 11:17

enxebre changed the base branch from crd to master October 17, 2018 11:21

update actuator for using new provider config

ea4fb15

enxebre force-pushed the crds branch from c7d67e4 to ea4fb15 Compare October 17, 2018 12:42

update docker and Makefile

0fc1b81

enxebre force-pushed the crds branch 2 times, most recently from 60e5b11 to 320f710 Compare October 17, 2018 13:50

fix lints

a0d06f7

enxebre force-pushed the crds branch from 320f710 to a0d06f7 Compare October 17, 2018 13:55

ingvagabund mentioned this pull request Oct 17, 2018

Bump to crd openshift/cluster-api-actuator-pkg#10

Merged

move to use manager controller runtime client and fix unit tests

7bc2a82

enxebre force-pushed the crds branch from 06530da to 7bc2a82 Compare October 17, 2018 21:33

ingvagabund reviewed Oct 18, 2018

View reviewed changes

enxebre added 2 commits October 18, 2018 18:07

revendor for testing framework

3c07079

re enable testing framework

8f6668c

enxebre changed the base branch from master to crd October 18, 2018 16:15

enxebre added 3 commits October 19, 2018 09:36

revendor for cluster api 2d88aef

1fb525f

use flag instead of pflag

63beccd

use Update() instead of Status.Update() as CustomResourceSubresources…

a023a30

… might not be enable

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2018

openshift-ci-robot assigned ingvagabund Oct 19, 2018

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2018

openshift-merge-robot merged commit 261db4a into openshift:crd Oct 19, 2018

wking mentioned this pull request Nov 28, 2018

Change the ApiVersion to the correct awsproviderconfig.k8s.io/v1alpha1 openshift/installer#748

Merged

Migrate to CRDs - WIP #67

Migrate to CRDs - WIP #67

Uh oh!

Conversation

enxebre commented Oct 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

frobware left a comment

Choose a reason for hiding this comment

Uh oh!

frobware Oct 11, 2018

Choose a reason for hiding this comment

Uh oh!

enxebre commented Oct 17, 2018

Uh oh!

ingvagabund Oct 18, 2018

Choose a reason for hiding this comment

Uh oh!

ingvagabund Oct 18, 2018

Choose a reason for hiding this comment

Uh oh!

ingvagabund Oct 18, 2018

Choose a reason for hiding this comment

Uh oh!

ingvagabund Oct 18, 2018

Choose a reason for hiding this comment

Uh oh!

enxebre Oct 19, 2018

Choose a reason for hiding this comment

Uh oh!

ingvagabund commented Oct 18, 2018

Uh oh!

enxebre commented Oct 18, 2018

Uh oh!

openshift-ci-robot commented Oct 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ingvagabund commented Oct 18, 2018

Uh oh!

ingvagabund commented Oct 18, 2018

Uh oh!

ingvagabund commented Oct 19, 2018

Uh oh!

ingvagabund commented Oct 19, 2018

Uh oh!

openshift-ci-robot commented Oct 19, 2018

Uh oh!

ingvagabund commented Oct 19, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

enxebre commented Oct 11, 2018 •

edited

Loading

openshift-ci-robot commented Oct 18, 2018 •

edited

Loading