properly generate extravolumes in kubeadmconfig for centos

[lukasz-bielinski]

kind bug

What this PR does / why we need it:
This is fix, for proper extravolumes generation for centos/rh in kubeadm config file.
Which issue(s) this PR fixes:

Does this PR introduce a user-facing change?:
NONE

[k8s-ci-robot]

Hi @lukasz-bielinski. 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.

[floryut]

/ok-to-test

[lukasz-bielinski]

/retest

[EppO]

/lgtm

[Miouge1]

AFAIK the >- to |- changes from strip to keep newlines in the multi line block. How is the newline situation important in JSON?

I've used: https://ansible.sivel.net/test/ to test it, i get ['/etc/pki/tls', '/etc/pki/ca-trust'] for ansible_os_family: RedHat and ['/usr/share/ca-certificates'] for ansible_os_family: Debian.

What is the problem?

[lukasz-bielinski]

@Miouge1 without change introduced in this pr loop in line 250

{% for dir in ssl_ca_dirs %}
  - name: {{ dir | regex_replace('^/(.*)$', '\\1' ) | regex_replace('/', '-') }}
    hostPath: {{ dir }}
    mountPath: {{ dir }}
    readOnly: true

in file

roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2

gives invalid output. when centos is used var ssl_ca_dirs is treated as one line. which gives us
in /etc/kubernetes/kubeadm-config.yaml

  - name: ('-etc-pki-tls', '-etc-pki-ca-trust')
    hostPath: ('/etc/pki/tls', '/etc/pki/ca-trust')
    mountPath: ('/etc/pki/tls', '/etc/pki/ca-trust')

and in /etc/kubernetes/manifests/kube-apiserver.yaml

  volumes:
  - hostPath:
      path: ('/etc/pki/tls', '/etc/pki/ca-trust')
      type: ""
    name: ('-etc-pki-tls', '-etc-pki-ca-trust')

entries mentioned above are not valid.

introduced change fixes it. and we have proper files generated. proper entries below:
/etc/kubernetes/kubeadm-config.yaml

  - name: etc-pki-tls
    hostPath: /etc/pki/tls
    mountPath: /etc/pki/tls
    readOnly: true
  - name: etc-pki-ca-trust
    hostPath: /etc/pki/ca-trust
    mountPath: /etc/pki/ca-trust
    readOnly: true

/etc/kubernetes/manifests/kube-apiserver.yaml

  - hostPath:
      path: /etc/pki/ca-trust
      type: ""
    name: etc-pki-ca-trust
  - hostPath:
      path: /etc/pki/tls
      type: ""
    name: etc-pki-tls

[EppO]

Don't merge your branch with master, rebase it on top of it:

# run the following commands in your branch
git reset --hard origin/master
git cherry-pick d8179a2521733ace4020ba99fd376ec3fbffc9d4
git push --force

[lukasz-bielinski]

Don't merge your branch with master, rebase it on top of it:

# run the following commands in your branch
git reset --hard origin/master
git cherry-pick d8179a2521733ace4020ba99fd376ec3fbffc9d4
git push --force

@EppO done

[EppO]

/lgtm

[Miouge1]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lukasz-bielinski, Miouge1

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

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