Update cilium_ipsec_enabled check #7413

fritchie · 2021-03-26T23:19:53Z

When attempting a fresh install without cilium_ipsec_enabled I ran
into the following error:

failed: [k8m01] (item={'name': 'cilium', 'file': 'cilium-secret.yml', 'type': 'secret', 'when': 'cilium_ipsec_enabled'}) =>
{"ansible_loop_var": "item", "changed": false, "item": {"file": "cilium-secret.yml", "name": "cilium", "type": "secret",
"when": "cilium_ipsec_enabled"},"msg": "AnsibleUndefinedVariable: 'cilium_ipsec_key' is undefined"}

Moving the when condition from the item level to the task level solved
the issue.

When attempting a fresh install without cilium_ipsec_enabled I ran into the following error: failed: [k8m01] (item={'name': 'cilium', 'file': 'cilium-secret.yml', 'type': 'secret', 'when': 'cilium_ipsec_enabled'}) => {"ansible_loop_var": "item", "changed": false, "item": {"file": "cilium-secret.yml", "name": "cilium", "type": "secret", "when": "cilium_ipsec_enabled"},"msg": "AnsibleUndefinedVariable: 'cilium_ipsec_key' is undefined"} Moving the when condition from the item level to the task level solved the issue.

k8s-ci-robot · 2021-03-26T23:20:00Z

Hi @fritchie. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

champtar · 2021-03-28T04:10:58Z

roles/network_plugin/cilium/tasks/install.yml

    - {name: cilium, file: cilium-ds.yml, type: ds}
    - {name: cilium, file: cilium-deploy.yml, type: deploy}
    - {name: cilium, file: cilium-sa.yml, type: sa}
  register: cilium_node_manifests
  when:
    - inventory_hostname in groups['kube_control_plane']
+    - item.file != "cilium-secret.yml" or (item.file == "cilium-secret.yml" and cilium_ipsec_enabled)


I think you can write it as:

item.when is defined and item.when

thx, this didn't seem to work for me

You've put back the when: that you're removing in this commit ?

yes, I set the item back to:

- {name: cilium, file: cilium-secret.yml, type: secret, when: cilium_ipsec_enabled}

when I tested

Sorry my logic is wrong
not item.when is defined or item.when ?

Make sure cilium_ipsec_key is defined in the role defaults ?

That would work but I didn't make the original IPsec PR. I assume the person who did has a reason for not defining a default for cilium_ipsec_key ... ie, if users used the default key it would not be a secret.

Sorry I was quickly answering from my phone, would {name: cilium, file: cilium-secret.yml, type: secret, when: cilium_ipsec_enabled is defined } work then ?

cilium_ipsec_enabled should always be defined, I also tried

- {name: cilium, file: cilium-secret.yml, type: secret, when: cilium_ipsec_key is defined and cilium_ipsec_enabled}

which fails with the error:

failed: [k8m01] (item={'name': 'cilium', 'file': 'cilium-secret.yml', 'type': 'secret', 'when': 'cilium_ipsec_key is defined and cilium_ipsec_enabled'}) => {"ansible_loop_var": "item", "changed": false, "item": {"file": "cilium-secret.yml", "name": "cilium", "type": "secret", "when": "cilium_ipsec_key is defined and cilium_ipsec_enabled"}, "msg": "AnsibleUndefinedVariable: 'cilium_ipsec_key' is undefined"}

Sorry for lagging behind but I was thinking of fixing it the same way @champtar wrote.
Weird that it's not working 🤔

champtar · 2021-03-28T14:01:28Z

/ok-to-test

oomichi · 2021-03-29T23:12:27Z

/lgtm

floryut · 2021-04-06T13:15:02Z

Well as https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1132752306 works fine, let's merge this as is to fix the bug, always room for improvement if needed later on.

k8s-ci-robot · 2021-04-06T13:15:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, fritchie

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

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

This is a followup to #7413 Although the code worked there was a desire for a better solution. Hopefully people will be happy with this alternative.

When attempting a fresh install without cilium_ipsec_enabled I ran into the following error: failed: [k8m01] (item={'name': 'cilium', 'file': 'cilium-secret.yml', 'type': 'secret', 'when': 'cilium_ipsec_enabled'}) => {"ansible_loop_var": "item", "changed": false, "item": {"file": "cilium-secret.yml", "name": "cilium", "type": "secret", "when": "cilium_ipsec_enabled"},"msg": "AnsibleUndefinedVariable: 'cilium_ipsec_key' is undefined"} Moving the when condition from the item level to the task level solved the issue.

This is a followup to kubernetes-sigs#7413 Although the code worked there was a desire for a better solution. Hopefully people will be happy with this alternative.

When attempting a fresh install without cilium_ipsec_enabled I ran into the following error: failed: [k8m01] (item={'name': 'cilium', 'file': 'cilium-secret.yml', 'type': 'secret', 'when': 'cilium_ipsec_enabled'}) => {"ansible_loop_var": "item", "changed": false, "item": {"file": "cilium-secret.yml", "name": "cilium", "type": "secret", "when": "cilium_ipsec_enabled"},"msg": "AnsibleUndefinedVariable: 'cilium_ipsec_key' is undefined"} Moving the when condition from the item level to the task level solved the issue.

This is a followup to kubernetes-sigs#7413 Although the code worked there was a desire for a better solution. Hopefully people will be happy with this alternative.

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 26, 2021

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 26, 2021

k8s-ci-robot requested review from holmsten and oomichi March 26, 2021 23:20

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 26, 2021

champtar reviewed Mar 28, 2021

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 28, 2021

k8s-ci-robot assigned oomichi Mar 29, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 29, 2021

champtar mentioned this pull request Apr 5, 2021

Fix cilium item loop with 'cilium_ipsec_enabled' #7443

Closed

floryut approved these changes Apr 6, 2021

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2021

k8s-ci-robot merged commit a6622b1 into kubernetes-sigs:master Apr 6, 2021

This was referenced Apr 15, 2021

Cilium upgrade to 1.9.5 #7512

Closed

Refactor cilium_ipsec_enabled check #7520

Merged

k8s-ci-robot pushed a commit that referenced this pull request Apr 19, 2021

Refactor cilium_ipsec_enabled check (#7520)

ce0b783

This is a followup to #7413 Although the code worked there was a desire for a better solution. Hopefully people will be happy with this alternative.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update cilium_ipsec_enabled check #7413

Update cilium_ipsec_enabled check #7413

fritchie commented Mar 26, 2021

k8s-ci-robot commented Mar 26, 2021

champtar Mar 28, 2021

fritchie Mar 28, 2021

champtar Mar 28, 2021

fritchie Mar 28, 2021

champtar Mar 28, 2021

champtar Mar 28, 2021

fritchie Mar 28, 2021 •

edited

champtar Mar 29, 2021

fritchie Mar 29, 2021 •

edited

floryut Apr 6, 2021

champtar commented Mar 28, 2021

oomichi commented Mar 29, 2021

floryut commented Apr 6, 2021

k8s-ci-robot commented Apr 6, 2021

Update cilium_ipsec_enabled check #7413

Update cilium_ipsec_enabled check #7413

Conversation

fritchie commented Mar 26, 2021

k8s-ci-robot commented Mar 26, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fritchie Mar 28, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fritchie Mar 29, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

champtar commented Mar 28, 2021

oomichi commented Mar 29, 2021

floryut commented Apr 6, 2021

k8s-ci-robot commented Apr 6, 2021

fritchie Mar 28, 2021 •

edited

fritchie Mar 29, 2021 •

edited