Fix invalid hubble yaml if cilium_hubble_tls_generate is enabled

[toonalbers]

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fix errors in the Hubble template when cilium_hubble_tls_generate due to whitespace issues.

Which issue(s) this PR fixes:
Fixes #10429

Does this PR introduce a user-facing change?:

[Cilium] Fix invalid hubble yaml if `cilium_hubble_tls_generate` is enabled

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: toonalbers / name: Toon Albers (cf8f373)

[k8s-ci-robot]

Welcome @toonalbers!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. 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/kubespray 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. 😃

[k8s-ci-robot]

Hi @toonalbers. 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.

[mzaian]

Thanks @toonalbers

/ok-to-test

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mzaian, toonalbers

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 [mzaian]

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

[yankay]

HI @toonalbers

Thanks for the fix :-)

It seems an issue about the whitespace-control of jinjia.

It can be solve by the code:

          {%- if cilium_hubble_tls_generate %}
          - mountPath: /var/lib/hubble-relay/tls
            name: tls
            readOnly: true
         {%- endif %}

There are simplar usage in the kubespray code :-)
we can check the template in the https://j2live.ttl255.com/

[toonalbers]

Hi @yankay,

Thank you for the review! I agree that adding the minus does result in neater YAML, but the newline is also still required. On https://j2live.ttl255.com/ it works fine without a newline, but in practice (at least with the Ansible version from requirements.txt) the result is malformed YAML.

Minus only:

$ kubectl apply -f /etc/kubernetes/addons/hubble/hubble-deploy.yml --dry-run=server
error: error parsing /etc/kubernetes/addons/hubble/hubble-deploy.yml: error converting YAML to JSON: yaml: line 61: mapping values are not allowed in this context

With the offending line 61:

59           - mountPath: /var/lib/hubble-relay/tls
60             name: tls
61             readOnly: true      restartPolicy: Always
62       serviceAccount: hubble-relay
63       serviceAccountName: hubble-relay

Newline only:

59           - mountPath: /var/lib/hubble-relay/tls
60             name: tls
61             readOnly: true
62
63       restartPolicy: Always
64       serviceAccount: hubble-relay
65       serviceAccountName: hubble-relay

Newline and minus:

59           - mountPath: /var/lib/hubble-relay/tls
60             name: tls
61             readOnly: true
62       restartPolicy: Always
63       serviceAccount: hubble-relay
64       serviceAccountName: hubble-relay

I will update the PR to add the minus to the front of the tags.

[yankay]

It can be solved by the {%- like the code before :-)

[yankay]

Thanks @toonalbers

/lgtm

[hassenius]

@yankay @floryut can we cherry-pick this one into the release-2.23 branch too?

[floryut]

@yankay @floryut can we cherry-pick this one into the release-2.23 branch too?

Yes, if you can do it that's great, otherwise I'll do it in the coming days 👍