Remove dependency on git from prepare node script #280

jonaskello · 2023-01-20T07:39:48Z

Reason for PR:
Eliminates dependency on git command

Issue Fixed:
278

Requirements

Sqaush commits
Documentation
Tests

k8s-ci-robot · 2023-01-20T07:39:57Z

Welcome @jonaskello!

It looks like this is your first PR to kubernetes-sigs/sig-windows-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/sig-windows-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

jonaskello · 2023-01-20T07:44:28Z

@jsturtevant I put the gitpath in a variable and made it point to the latest version. It would be better if it pointed to the exact version but I don't see how that could be done without depending on cloning the repo and using git.

jsturtevant · 2023-01-20T16:48:41Z

kubeadm/scripts/PrepareNode.ps1

 Write-Output "Please remember that after you have joined the node to the cluster, that you have to apply the cni daemonset/service and the kube-proxy"
 Write-Output "Also remember that for kube-proxy you have to change the its version from the name of the image in the kube-proxy.yml to that of your kubernetes version `n"
 # rancher commands
 Write-Output "In case you use rancher, use the following commands:"
 Write-Output "For Windows you can use the following command: "
-Write-Output "(Get-Content `"$(git rev-parse --show-toplevel)/kubeadm/kube-proxy/kube-proxy.yml`") -Replace 'VERSION', '$KubernetesVersion' | Set-Content `"$(git rev-parse --show-toplevel)/kubeadm/kube-proxy/kube-proxy.yml`" `n"
+Write-Output "(Get-Content `"$gitpath/kubeadm/kube-proxy/kube-proxy.yml`") -Replace 'VERSION', '$KubernetesVersion' | Set-Content `"$gitpath/kubeadm/kube-proxy/kube-proxy.yml`" `n"


is this right?

Set-Content `"$gitpath/kubeadm/kube-

I would have thought this would be local path

Yes, I misunderstood the original intention here I think. I think this part of the script assumes that you git cloned the whole repo down.

However the guide tells you to download this script with curl and run it. So in that case it will not run from within a cloned repo and local paths will not work. So for that reason I think the commands to apply the manifests for kubeproxy should refer to the online manifests by using http urls.

However then of course the Get-Content needs to be changed to curl commands. I'll do that and see if it makes more sense.

I ended up first downloading the manifest and then patching the local file with the version. Do you think this will work?

jsturtevant · 2023-01-20T16:49:21Z

kubeadm/scripts/PrepareNode.ps1

@@ -105,24 +105,26 @@ nssm set kubelet DependOnService containerd

 New-NetFirewallRule -Name kubelet -DisplayName 'kubelet' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 10250

+$gitpath='https://raw.githubusercontent.com/kubernetes-sigs/sig-windows-tools/master'


gitpath varaible is a bit misleading. maybe repositoryRoot or something else?

jonaskello · 2023-01-21T16:18:46Z

Thinking some more on this, perhaps the last part of the script that prints instructions on how to setup kube-proxy could be removed and the instructions moved to the guide document instead?

jsturtevant · 2023-01-23T17:03:00Z

Thinking some more on this, perhaps the last part of the script that prints instructions on how to setup kube-proxy could be removed and the instructions moved to the guide document instead?

yea this makes sense to me... I think it might already be in those guides? This was added before we had a guide.

jsturtevant · 2023-02-10T16:49:41Z

/lgtm
/approve

claudiubelu · 2023-04-27T10:09:31Z

LGTM, but needs a rebase.

k8s-ci-robot · 2023-04-28T05:29:06Z

New changes are detected. LGTM label has been removed.

jonaskello · 2023-04-28T05:33:22Z

Should be rebased now

jsturtevant · 2023-04-28T15:56:41Z

@jonaskello Could you squash the commits and make sure the commits are valid? (I am not really sure what is invalid about them but hoping squashing will get rid of the warning

k8s-ci-robot · 2023-05-02T05:36:55Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jonaskello, jsturtevant

The full list of commands accepted by this bot can be found 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

jonaskello · 2023-05-02T05:43:55Z

@jsturtevant Failed to fix this PR, making a new attempt in #299

k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 20, 2023

k8s-ci-robot requested review from jayunit100 and marosset January 20, 2023 07:39

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 20, 2023

github-actions bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 20, 2023

k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 20, 2023

jsturtevant reviewed Jan 20, 2023

View reviewed changes

k8s-ci-robot assigned jsturtevant Feb 10, 2023

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 10, 2023

jsturtevant mentioned this pull request Apr 14, 2023

Split guide to make easier to follow #272

Closed

3 tasks

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 15, 2023

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2023

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 28, 2023

jonaskello closed this May 2, 2023

k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label May 2, 2023

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 2, 2023

jonaskello mentioned this pull request May 2, 2023

Remove dependency on git from prepare node script #299

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove dependency on git from prepare node script #280

Remove dependency on git from prepare node script #280

jonaskello commented Jan 20, 2023 •

edited

Loading

k8s-ci-robot commented Jan 20, 2023

jonaskello commented Jan 20, 2023 •

edited

Loading

jsturtevant Jan 20, 2023

jonaskello Jan 20, 2023

jonaskello Jan 20, 2023

jsturtevant Jan 20, 2023

jonaskello commented Jan 21, 2023

jsturtevant commented Jan 23, 2023

jsturtevant commented Feb 10, 2023

claudiubelu commented Apr 27, 2023

k8s-ci-robot commented Apr 28, 2023

jonaskello commented Apr 28, 2023

jsturtevant commented Apr 28, 2023

k8s-ci-robot commented May 2, 2023

jonaskello commented May 2, 2023

		@@ -105,24 +105,26 @@ nssm set kubelet DependOnService containerd

		New-NetFirewallRule -Name kubelet -DisplayName 'kubelet' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 10250

		$gitpath='https://raw.githubusercontent.com/kubernetes-sigs/sig-windows-tools/master'

Remove dependency on git from prepare node script #280

Remove dependency on git from prepare node script #280

Conversation

jonaskello commented Jan 20, 2023 • edited Loading

k8s-ci-robot commented Jan 20, 2023

jonaskello commented Jan 20, 2023 • edited Loading

jsturtevant Jan 20, 2023

Choose a reason for hiding this comment

jonaskello Jan 20, 2023

Choose a reason for hiding this comment

jonaskello Jan 20, 2023

Choose a reason for hiding this comment

jsturtevant Jan 20, 2023

Choose a reason for hiding this comment

jonaskello commented Jan 21, 2023

jsturtevant commented Jan 23, 2023

jsturtevant commented Feb 10, 2023

claudiubelu commented Apr 27, 2023

k8s-ci-robot commented Apr 28, 2023

jonaskello commented Apr 28, 2023

jsturtevant commented Apr 28, 2023

k8s-ci-robot commented May 2, 2023

jonaskello commented May 2, 2023

jonaskello commented Jan 20, 2023 •

edited

Loading

jonaskello commented Jan 20, 2023 •

edited

Loading