contrib/pkg/awstagdeprovision: Replace with installer/pkg/destroy/aws #144
Conversation
I've moved the package over to the installer to break the hive <-> installer dependency loop.
…8d17f05 Generated with: $ emacs Gopkg.toml # pin installer to a7468d16b81d $ dep ensure using: $ dep version dep: version : v0.5.0 build date : git hash : 22125cf go version : go1.10.3 go compiler : gc platform : linux/amd64 features : ImportDuringSolve=false This pulls in the new pkg/destroy/aws (which is descended from our previous contrib/pkg/awstagdeprovision). I've also added non-go and unused-packages to the prune block, because there's no need to ship those around when we don't need them. For example, this avoids pulling in the installer's newly-vendored Terraform source.
openshift-ci-robot
added
the
size/XXL
Catching up with openshift/installer@6f55e673 (terraform/aws: remove option to use an existing vpc in aws, 2018-11-11, openshift/installer#654).
|
Hrm. Now I think I need more background on why we have the install-config types under |
wking
force-pushed
the
vendor-aws-destroy-logic
branch
from
2a66f36 to
02ff8fa
Compare
Catching up with openshift/installer@b2d6fa40 (validate: simplify CIDR validation, 2018-11-27, openshift/installer#711). We can't convert the v1alpha1 type to an *IPNet, because it doesn't have DeepCopyInto methods [1]: go vet ./pkg/... ./cmd/... ./contrib/... # github.com/openshift/hive/pkg/apis/hive/v1alpha1 pkg/apis/hive/v1alpha1/zz_generated.deepcopy.go:87:8: (*in).DeepCopyInto undefined (type *ipnet.IPNet has no field or method DeepCopyInto) We used to define those methods in the installer, but stopped in openshift/installer@ca6f6195 (Revert "pkg/ipnet: Add DeepCopy and DeepCopyInto for IPNet", 2018-09-20, openshift/installer#295). [1]: https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_hive/144/pull-ci-openshift-hive-master-unit/253/build-log.txt
wking
force-pushed
the
vendor-aws-destroy-logic
branch
from
02ff8fa to
f046c35
Compare
|
Looks like you got this solved but for context if you recall way back in the arch calls a few months ago we had multiple discussions on using InstallConfig types in Kube. (Hive is driven by CRDs, the main one being ClusterDeployment which embeds something very similar to, but different than, InstallConfig. We decided on call the best path would be to fork but keep them as similar as possible given the different needs of each. |
|
This looks good, thanks @wking we had a card for this and now we can close it. :) I've tested creating a cluster deployment and everything looks good. CC @joelddiaz no need to move deprovision code to installer now. /lgtm |
4 participants
I've moved the package over to the installer with openshift/installer#940 to break the hive <-> installer dependency loop.
While bumping
vendor/, I also addednon-goandunused-packagesto the prune block inGopkg.toml. This avoids pulling in the installer's newly-vendored Terraform source (openshift/installer#919), but it also removes a whole bunch of previously-vendored stuff. I don't think that will cause any problems, but I guess we'll see in CI.