Skip to content
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

Jump to bottom

🏃 [ci-conformance] Fix kustomize template to better handle envsubst #292

Merged
merged 1 commit into from
Apr 22, 2020
Merged

🏃 [ci-conformance] Fix kustomize template to better handle envsubst #292

merged 1 commit into from
Apr 22, 2020

Conversation

detiber
Copy link
Member

@detiber detiber commented Apr 6, 2020

What this PR does / why we need it:

Updates the script used during conformance testing against upstream k8s to remove bash variables other than the ones we replace with the call to envsubst, since envsubst is replacing them with empty strings currently.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 6, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2020
@detiber
Copy link
Member Author

detiber commented Apr 6, 2020

/assign @ncdc

@detiber
Copy link
Member Author

detiber commented Apr 7, 2020

/test pull-cluster-api-provider-gcp-make-conformance

1 similar comment
@detiber
Copy link
Member Author

detiber commented Apr 10, 2020

/test pull-cluster-api-provider-gcp-make-conformance

@detiber detiber changed the title 🏃 [ci-conformance] Fix kustomize template to better handle envsubst [WIP] 🏃 [ci-conformance] Fix kustomize template to better handle envsubst Apr 10, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 10, 2020
@detiber
Copy link
Member Author

detiber commented Apr 13, 2020

/test pull-cluster-api-provider-gcp-make-conformance

3 similar comments
@detiber
Copy link
Member Author

detiber commented Apr 13, 2020

/test pull-cluster-api-provider-gcp-make-conformance

@detiber
Copy link
Member Author

detiber commented Apr 13, 2020

/test pull-cluster-api-provider-gcp-make-conformance

@detiber
Copy link
Member Author

detiber commented Apr 13, 2020

/test pull-cluster-api-provider-gcp-make-conformance

@detiber detiber mentioned this pull request Apr 14, 2020
Closed
@detiber
Copy link
Member Author

detiber commented Apr 16, 2020

/test pull-cluster-api-provider-gcp-make-conformance

1 similar comment
@detiber
Copy link
Member Author

detiber commented Apr 17, 2020

/test pull-cluster-api-provider-gcp-make-conformance

@detiber detiber changed the title [WIP] 🏃 [ci-conformance] Fix kustomize template to better handle envsubst 🏃 [ci-conformance] Fix kustomize template to better handle envsubst Apr 20, 2020
@k8s-ci-robot k8s-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 Apr 20, 2020
@detiber
[ci-conformance] Fix kustomize template to better handle envsubst
804ab0d 
- Increase timeout for getting nodes
- Fix GCPMachine watch in GCPCluster controller
- Fix template errors
- Remove cloud-init bootstrapping in favor of building an image with the ci artifacts
@detiber
Copy link
Member Author

detiber commented Apr 20, 2020

/assign @gab-satchi
@gab-satchi ptal at this change as well, it is very similar to the changes made to CAPA, with the one exception that we need to build an image as part of CI anyway, so rather than overriding the binaries at cloud-init bootstrapping time, we are now building the k8s ci artifacts into the image we are building instead.

vincepri
vincepri approved these changes Apr 20, 2020
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

I did a quick pass-through and in general this LGTM, I'll leave the final word to @gab-satchi

gab-satchi
gab-satchi reviewed Apr 20, 2020
View reviewed changes
controllers/gcpcluster_controller.go
@@ -50,7 +50,7 @@ func (r *GCPClusterReconciler) SetupWithManager(mgr ctrl.Manager, options contro
WithOptions(options).
For(&infrav1.GCPCluster{}).
Watches(
&source.Kind{Type: &infrav1.GCPCluster{}},
&source.Kind{Type: &infrav1.GCPMachine{}},
Copy link
Member

Choose a reason for hiding this comment

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

I guess this handler was just failing until now :p

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, I only noticed when I switched to testing and troubleshooting locally.

gab-satchi
gab-satchi reviewed Apr 20, 2020
View reviewed changes
Copy link
Member

@gab-satchi gab-satchi left a comment

Choose a reason for hiding this comment

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

lgtm

@gab-satchi
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit e430a7a into kubernetes-sigs:master Apr 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gab-satchi gab-satchi gab-satchi left review comments

@vincepri vincepri vincepri approved these changes

@krousey krousey Awaiting requested review from krousey

@maisem maisem Awaiting requested review from maisem

Assignees

@ncdc ncdc

@gab-satchi gab-satchi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@detiber @k8s-ci-robot @gab-satchi @vincepri @ncdc