Api pivot #150

vikaschoudhary16 · 2019-02-05T12:27:18Z

Add awsproviderconfig under oepnshift.io group

This was got removed in this commit, openshift@9ba17c5

openshift-ci-robot · 2019-02-05T12:27:38Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: vikaschoudhary16

If they are not already assigned, you can assign the PR to them by writing /assign @vikaschoudhary16 in a comment when ready.

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

The pull request process is described here

Needs approval from an approver in each of these files:

OWNERS

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

enxebre · 2019-02-05T12:33:37Z

This seems to be introducing a lot of API changes.
Can we split this in different PRs? One for pivoting the API group. Then follow ups for the explicit API changes
This needs openshift/installer#1175 to get in so then we can update the e2e-operator tests here to run against machine.openshift.io group and merge this safely
/hold

ingvagabund · 2019-02-07T10:18:28Z

@vikaschoudhary16 I don't think we need to s/awsproviderconfig/openshiftawsproviderconfig the package name. It's sufficient to just change s/awsproviderconfig.k8s.io/awsproviderconfig.openshift.io.

vikaschoudhary16 · 2019-02-07T10:55:45Z

@ingvagabund group name is awsprovider.openshift.io. Directory name is including openshift because initially i had upstream apis in awsprovider dir at same path. Do we think that we will never have both upstream and openshift apis at this path?

ingvagabund · 2019-02-07T11:15:43Z

@ingvagabund group name is awsprovider.openshift.io. Directory name is including openshift because initially i had upstream apis in awsprovider dir at same path. Do we think that we will never have both upstream and openshift apis at this path?

If we will, we can always do it later. And most likely we would run two actuators, each for one group.

enxebre · 2019-02-07T11:47:25Z

pkg/actuators/machine/actuator.go

@@ -134,7 +135,11 @@ func (a *Actuator) updateMachineStatus(machine *machinev1.Machine, awsStatus *pr
 	}

 	oldAWSStatus := &providerconfigv1.AWSMachineProviderStatus{}
-	if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, oldAWSStatus); err != nil {
+	//if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, oldAWSStatus); err != nil {


Can you add to do here explaining why is needed?

Instead of replacing a.codec.DecodeProviderStatus with yaml.Unmarshal, let's replace the code in DecodeProviderStatus itself [1].

[1] https://github.com/openshift/cluster-api-provider-aws/blob/master/pkg/apis/awsproviderconfig/v1alpha1/register.go#L110

enxebre · 2019-02-07T11:48:08Z

pkg/actuators/machine/actuator.go

@@ -499,8 +504,12 @@ func (a *Actuator) updateStatus(machine *machinev1.Machine, instance *ec2.Instan

 	// Starting with a fresh status as we assume full control of it here.
 	awsStatus := &providerconfigv1.AWSMachineProviderStatus{}
-	if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, awsStatus); err != nil {
-		glog.Errorf("error decoding machine provider status: %v", err)
+	//if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, awsStatus); err != nil {


Can you add to do here explaining why is needed?

enxebre · 2019-02-07T11:48:13Z

pkg/actuators/machine/utils.go

@@ -181,7 +182,12 @@ func providerConfigFromMachine(client client.Client, machine *machinev1.Machine,
 	}

 	var config providerconfigv1.AWSMachineProviderConfig
-	if err := codec.DecodeProviderSpec(&machinev1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {
+
+	//	if err := codec.DecodeProviderSpec(&machinev1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {


Can you add to do here explaining why is needed?

The same here. Please update DecodeProviderSpec itself [1] rather than replacing DecodeProviderSpec.

[1] https://github.com/openshift/cluster-api-provider-aws/blob/master/pkg/apis/awsproviderconfig/v1alpha1/register.go#L79

ingvagabund · 2019-02-07T15:24:30Z

/test e2e

ingvagabund · 2019-02-07T15:45:01Z

pkg/actuators/machine/actuator.go

@@ -134,7 +135,11 @@ func (a *Actuator) updateMachineStatus(machine *machinev1.Machine, awsStatus *pr
 	}

 	oldAWSStatus := &providerconfigv1.AWSMachineProviderStatus{}
-	if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, oldAWSStatus); err != nil {
+	//if err := a.codec.DecodeProviderStatus(machine.Status.ProviderStatus, oldAWSStatus); err != nil {


Instead of replacing a.codec.DecodeProviderStatus with yaml.Unmarshal, let's replace the code in DecodeProviderStatus itself [1].

[1] https://github.com/openshift/cluster-api-provider-aws/blob/master/pkg/apis/awsproviderconfig/v1alpha1/register.go#L110

ingvagabund · 2019-02-07T15:46:00Z

pkg/actuators/machine/utils.go

@@ -181,7 +182,12 @@ func providerConfigFromMachine(client client.Client, machine *machinev1.Machine,
 	}

 	var config providerconfigv1.AWSMachineProviderConfig
-	if err := codec.DecodeProviderSpec(&machinev1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {
+
+	//	if err := codec.DecodeProviderSpec(&machinev1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {


The same here. Please update DecodeProviderSpec itself [1] rather than replacing DecodeProviderSpec.

[1] https://github.com/openshift/cluster-api-provider-aws/blob/master/pkg/apis/awsproviderconfig/v1alpha1/register.go#L79

openshift-ci-robot · 2019-02-07T17:33:14Z

@vikaschoudhary16: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/gofmt	`1ac11a4`	link	`/test gofmt`
ci/jenkins/e2e	`1ac11a4`	link	`/test e2e`
ci/prow/e2e-aws-operator	`1ac11a4`	link	`/test e2e-aws-operator`
ci/prow/e2e-aws	`1ac11a4`	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.

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.

openshift-ci-robot · 2019-02-09T07:35:51Z

@vikaschoudhary16: PR needs rebase.

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.

ingvagabund · 2019-02-22T20:51:39Z

Closing in favor of #152. Thank you @vikaschoudhary16 for the PR.

* Add region cluster configuration parameter Signed-off-by: Vince Prignano <vince@vincepri.com> * pass region in status Signed-off-by: Vince Prignano <vince@vincepri.com>

Bring back logic which is required for deep-copy auto-generation.

a071cb8

This was got removed in this commit, openshift@9ba17c5

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 5, 2019

openshift-ci-robot requested review from enxebre and paulfantom February 5, 2019 12:27

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2019

vikaschoudhary16 force-pushed the api-pivot branch from a9b3aa9 to ad62f70 Compare February 6, 2019 10:09

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 6, 2019

vikaschoudhary16 force-pushed the api-pivot branch 2 times, most recently from 4efec09 to 87c5e39 Compare February 6, 2019 10:16

vikaschoudhary16 force-pushed the api-pivot branch from 87c5e39 to 702e7a2 Compare February 7, 2019 10:45

vikaschoudhary16 force-pushed the api-pivot branch 3 times, most recently from 38fee92 to 69668ad Compare February 7, 2019 11:44

enxebre reviewed Feb 7, 2019

View reviewed changes

vikaschoudhary16 force-pushed the api-pivot branch 3 times, most recently from f92c014 to ee6e31a Compare February 7, 2019 14:50

ingvagabund requested changes Feb 7, 2019

View reviewed changes

Add awsproviderconfig under oepnshift.io group

1ac11a4

vikaschoudhary16 force-pushed the api-pivot branch from ee6e31a to 1ac11a4 Compare February 7, 2019 16:37

ingvagabund mentioned this pull request Feb 7, 2019

Api pivot #152

Merged

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2019

ingvagabund closed this Feb 22, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Api pivot #150

Api pivot #150

vikaschoudhary16 commented Feb 5, 2019

openshift-ci-robot commented Feb 5, 2019

enxebre commented Feb 5, 2019

ingvagabund commented Feb 7, 2019

vikaschoudhary16 commented Feb 7, 2019

ingvagabund commented Feb 7, 2019

enxebre Feb 7, 2019

ingvagabund Feb 7, 2019

enxebre Feb 7, 2019

enxebre Feb 7, 2019

vikaschoudhary16 Feb 7, 2019

ingvagabund Feb 7, 2019

ingvagabund commented Feb 7, 2019

ingvagabund Feb 7, 2019

ingvagabund Feb 7, 2019

openshift-ci-robot commented Feb 7, 2019

openshift-ci-robot commented Feb 9, 2019

ingvagabund commented Feb 22, 2019

Api pivot #150

Api pivot #150

Conversation

vikaschoudhary16 commented Feb 5, 2019

openshift-ci-robot commented Feb 5, 2019

enxebre commented Feb 5, 2019

ingvagabund commented Feb 7, 2019

vikaschoudhary16 commented Feb 7, 2019

ingvagabund commented Feb 7, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ingvagabund commented Feb 7, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Feb 7, 2019

openshift-ci-robot commented Feb 9, 2019

ingvagabund commented Feb 22, 2019