pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP #191

hexfusion · 2020-02-21T18:23:56Z

This PR adds validation for the IPs we collect from local interfaces of bootstrap node. Instead of taking the first IPv4 address or IPv6 (single stack). We attempt to parse the MachineCIDR from installer assets. We then validate if the IP address is part of this network.

To do this we are adding a new flag --cluster-network-file currently we pass the network-config
to the --cluster-config [1] This change will require installer update.

enhancements openshift/enhancements#228

[1] https://github.com/openshift/installer/blob/98773b31eca6002e6f44375118d9eae8467cd016/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template#L135

openshift-ci-robot · 2020-02-21T18:24:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion

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~~ [hexfusion]

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

hexfusion · 2020-02-21T23:05:36Z

/skip

Signed-off-by: Sam Batschelet <[email protected]>

hexfusion · 2020-02-24T11:04:41Z

/hold

needs enhancement and a few tweaks I am trying to piviot this etcd spec to something more inline with what a revision from installer would lay down

Signed-off-by: Sam Batschelet <[email protected]>

hexfusion · 2020-02-24T14:11:18Z

I think the static pod might have to wait depending on if this is blocking for metal.

openshift-ci-robot · 2020-02-24T14:22:19Z

@hexfusion: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-azure	`1fb6173`	link	`/test e2e-azure`

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.

hexfusion · 2020-02-24T22:36:20Z

pkg/cmd/render/render.go

+		}
+	}
+
+	// depricated


deprecated ..

hexfusion · 2020-02-24T22:38:38Z

pkg/cmd/render/render.go

@@ -81,7 +85,8 @@ func (r *renderOpts) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&r.kubeClientAgentImage, "manifest-kube-client-agent-image", r.kubeClientAgentImage, "kube-client-agent manifest image")
 	fs.StringVar(&r.setupEtcdEnvImage, "manifest-setup-etcd-env-image", r.setupEtcdEnvImage, "setup-etcd-env manifest image")
 	fs.StringVar(&r.etcdDiscoveryDomain, "etcd-discovery-domain", r.etcdDiscoveryDomain, "etcd discovery domain")
-	fs.StringVar(&r.clusterConfigFile, "cluster-config-file", r.clusterConfigFile, "Openshift Cluster API Config file.")
+	fs.StringVar(&r.clusterNetworkFile, "cluster-config-file", r.clusterNetworkFile, "Openshift Cluster API Config file.") //TODO move back to normal values after installer change.
+	fs.StringVar(&r.clusterNetworkFile, "cluster-network-file", r.clusterNetworkFile, "Openshift Cluster Network API Config file.")


this is intended so we can update the installer and still pass CI.

hexfusion · 2020-02-24T23:06:16Z

/skip

hexfusion · 2020-02-25T01:08:44Z

/hold cancel

hexfusion · 2020-03-05T18:13:49Z

/hold

I am afraid to merge with without IPv6 test

openshift-ci-robot · 2020-03-09T17:07:29Z

@hexfusion: 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.

hexfusion · 2020-06-11T12:34:40Z

/close

openshift-ci-robot · 2020-06-11T12:34:56Z

@hexfusion: Closed this PR.

In response to this:

/close

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.

hexfusion · 2020-06-11T12:36:09Z

work continued https://github.com/openshift/cluster-etcd-operator/pull/375/files

openshift-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 Feb 21, 2020

hexfusion changed the title ~~[wip] pkg/cmd/render: ipv6 improvements #190~~ [wip] pkg/cmd/render: ipv6 improvements Feb 21, 2020

openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 21, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 21, 2020

openshift-ci-robot requested review from alaypatel07 and deads2k February 21, 2020 18:25

hexfusion force-pushed the fix-ipv6-3 branch from bd67d5f to 1d91072 Compare February 21, 2020 19:28

hexfusion changed the title ~~[wip] pkg/cmd/render: ipv6 improvements~~ pkg/cmd/render: ipv6 improvements Feb 21, 2020

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 Feb 21, 2020

hexfusion mentioned this pull request Feb 21, 2020

etcd operator openshift/enhancements#222

Closed

37 tasks

hexfusion changed the title ~~pkg/cmd/render: ipv6 improvements~~ [wip] pkg/cmd/render: ipv6 improvements Feb 22, 2020

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 22, 2020

hexfusion force-pushed the fix-ipv6-3 branch from 1d91072 to b7a7664 Compare February 23, 2020 12:45

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

hexfusion force-pushed the fix-ipv6-3 branch 2 times, most recently from db60c05 to b09208d Compare February 23, 2020 22:01

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 23, 2020

hexfusion force-pushed the fix-ipv6-3 branch 2 times, most recently from 957e956 to 697044f Compare February 23, 2020 22:06

pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP

6da2474

Signed-off-by: Sam Batschelet <[email protected]>

hexfusion force-pushed the fix-ipv6-3 branch from 697044f to 1d89caa Compare February 23, 2020 22:34

hexfusion changed the title ~~[wip] pkg/cmd/render: ipv6 improvements~~ pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP Feb 23, 2020

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 Feb 23, 2020

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 24, 2020

pkg/cmd/render: update tests and move test fixtures to testdata dir

cb9cdb4

Signed-off-by: Sam Batschelet <[email protected]>

hexfusion added 2 commits February 24, 2020 07:06

*: stub out networkhelpers

f7f9c3c

Signed-off-by: Sam Batschelet <[email protected]>

pkg/cmd/render: properly setMachineCIDR when multiple records exist

1fb6173

Signed-off-by: Sam Batschelet <[email protected]>

hexfusion force-pushed the fix-ipv6-3 branch from 1d89caa to 1fb6173 Compare February 24, 2020 12:06

hexfusion commented Feb 24, 2020

View reviewed changes

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

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

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

openshift-ci-robot closed this Jun 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP #191

pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP #191

hexfusion commented Feb 21, 2020 •

edited

Loading

openshift-ci-robot commented Feb 21, 2020

hexfusion commented Feb 21, 2020

hexfusion commented Feb 24, 2020

hexfusion commented Feb 24, 2020 •

edited

Loading

openshift-ci-robot commented Feb 24, 2020

hexfusion Feb 24, 2020

hexfusion Feb 24, 2020

hexfusion commented Feb 24, 2020

hexfusion commented Feb 25, 2020

hexfusion commented Mar 5, 2020

openshift-ci-robot commented Mar 9, 2020

hexfusion commented Jun 11, 2020

openshift-ci-robot commented Jun 11, 2020

hexfusion commented Jun 11, 2020

pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP #191

pkg/cmd/render: use machineNetwork CIDR to validate bootstrap IP #191

Conversation

hexfusion commented Feb 21, 2020 • edited Loading

openshift-ci-robot commented Feb 21, 2020

hexfusion commented Feb 21, 2020

hexfusion commented Feb 24, 2020

hexfusion commented Feb 24, 2020 • edited Loading

openshift-ci-robot commented Feb 24, 2020

hexfusion Feb 24, 2020

Choose a reason for hiding this comment

hexfusion Feb 24, 2020

Choose a reason for hiding this comment

hexfusion commented Feb 24, 2020

hexfusion commented Feb 25, 2020

hexfusion commented Mar 5, 2020

openshift-ci-robot commented Mar 9, 2020

hexfusion commented Jun 11, 2020

openshift-ci-robot commented Jun 11, 2020

hexfusion commented Jun 11, 2020

hexfusion commented Feb 21, 2020 •

edited

Loading

hexfusion commented Feb 24, 2020 •

edited

Loading