Skip to content

Fix layout for kustomize 2.0.0 #215

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
Merged
openshift-merge-robot merged 1 commit into from
Feb 12, 2019
Merged

Fix layout for kustomize 2.0.0 #215

openshift-merge-robot merged 1 commit into from
Feb 12, 2019

Conversation

@twiest
Copy link
Contributor

@twiest twiest commented Feb 7, 2019 •
edited
Loading

  • Fix layout for kustomize 2.0.0
  • Lock e2e test to kustomize 2.0.0
  • Test asset generation with new kustomize file and locations.
  • Test deploy with new kustomize file and locations.

@jewzaam jewzaam mentioned this pull request Feb 7, 2019
Closed
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 7, 2019
@twiest twiest force-pushed the fix_for_kustomize branch 2 times, most recently from 5475747 to 7793ea5 Compare February 7, 2019 20:41
@twiest twiest changed the title Fix layout for newer version of kustomize Fix layout for kustomize 2.0.0 Feb 7, 2019
@twiest twiest force-pushed the fix_for_kustomize branch from 7793ea5 to 0792860 Compare February 7, 2019 20:50
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 7, 2019
@twiest twiest force-pushed the fix_for_kustomize branch 2 times, most recently from ac8125a to 0fd4d70 Compare February 7, 2019 20:57
Fix layout for kustomize 2.0.0
97ab2d2 
- [x] Fix layout for kustomize 2.0.0
- [x] Lock e2e test to kustomize 2.0.0
- [x] Test asset generation with new kustomize file and locations.
- [x] Test deploy with new kustomize file and locations.
@twiest twiest force-pushed the fix_for_kustomize branch from 0fd4d70 to 97ab2d2 Compare February 7, 2019 20:58
@csrwng
Copy link
Contributor

csrwng commented Feb 7, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
@csrwng
Copy link
Contributor

csrwng commented Feb 7, 2019

/test unit

@csrwng
Copy link
Contributor

csrwng commented Feb 7, 2019

I think we need to increase the resource reqs for our unit tests to prevent timeouts

@twiest
Copy link
Contributor Author

twiest commented Feb 7, 2019

/test e2e

@csrwng
Copy link
Contributor

csrwng commented Feb 7, 2019

@twiest @dgoodwin looks like our generated install-config is out of sync with the one from the installer

level=debug msg="Generating \"Terraform Variables\"..."
panic: interface conversion: runtime.Object is nil, not *v1alpha1.AWSMachineProviderConfig

goroutine 1 [running]:
github.com/openshift/installer/pkg/asset/cluster.(*TerraformVariables).Generate(0x862e450, 0xc420888cc0, 0xc420c1b9f0, 0x2)
	/go/src/github.com/openshift/installer/pkg/asset/cluster/tfvars.go:109 +0x1399
github.com/openshift/installer/pkg/asset/store.(*storeImpl).fetch(0xc4203d09f0, 0x51b1180, 0x862e450, 0x0, 0x0, 0x44db1e0, 0x461f9c0)
	/go/src/github.com/openshift/installer/pkg/asset/store/store.go:226 +0x7c0
github.com/openshift/installer/pkg/asset/store.(*storeImpl).Fetch(0xc4203d09f0, 0x51b1180, 0x862e450, 0x51b1180, 0x862e450)
	/go/src/github.com/openshift/installer/pkg/asset/store/store.go:76 +0x4b
main.runTargetCmd.func1(0x7fff5f9cd45f, 0x7, 0xc4203ed420, 0xc42097bbf8)
	/go/src/github.com/openshift/installer/cmd/openshift-install/create.go:157 +0x13f
main.runTargetCmd.func2(0x8606940, 0xc420680c00, 0x0, 0x4)
	/go/src/github.com/openshift/installer/cmd/openshift-install/create.go:182 +0x81
github.com/openshift/installer/vendor/github.com/spf13/cobra.(*Command).execute(0x8606940, 0xc420680bc0, 0x4, 0x4, 0x8606940, 0xc420680bc0)
	/go/src/github.com/openshift/installer/vendor/github.com/spf13/cobra/command.go:766 +0x2c1
github.com/openshift/installer/vendor/github.com/spf13/cobra.(*Command).ExecuteC(0xc4203be500, 0x0, 0xc4203bf680, 0xc4203be650)
	/go/src/github.com/openshift/installer/vendor/github.com/spf13/cobra/command.go:852 +0x30a
github.com/openshift/installer/vendor/github.com/spf13/cobra.(*Command).Execute(0xc4203be500, 0xc42097beb8, 0x1)
	/go/src/github.com/openshift/installer/vendor/github.com/spf13/cobra/command.go:800 +0x2b
main.installerMain()
	/go/src/github.com/openshift/installer/cmd/openshift-install/main.go:56 +0x132
main.main()
	/go/src/github.com/openshift/installer/cmd/openshift-install/main.go:40 +0x9b

@dgoodwin
Copy link
Contributor

dgoodwin commented Feb 8, 2019

I will take a look this morning.

@dgoodwin
Copy link
Contributor

dgoodwin commented Feb 8, 2019 •
edited
Loading

It's probably this: openshift/installer#1175

EDIT: it wasn't

@dgoodwin
Copy link
Contributor

dgoodwin commented Feb 8, 2019

openshift/installer#1205

@dgoodwin
Copy link
Contributor

dgoodwin commented Feb 12, 2019

/test e2e

1 similar comment
@csrwng
Copy link
Contributor

csrwng commented Feb 12, 2019

/test e2e

@openshift-merge-robot openshift-merge-robot merged commit 1ed4e67 into openshift:master Feb 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abutcher abutcher Awaiting requested review from abutcher

@dgoodwin dgoodwin Awaiting requested review from dgoodwin

Assignees

@csrwng csrwng

Labels

lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@twiest @csrwng @dgoodwin @openshift-ci-robot @openshift-merge-robot