Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove runtime-config from kubeadm if empty #6311

Merged
merged 1 commit into from
Jun 30, 2020

Conversation

floryut
Copy link
Member

@floryut floryut commented Jun 23, 2020

What type of PR is this?
/kind bug

What this PR does / why we need it:
In kubeadm-config file, the field runtime-config is always printed (as it's default to []) even if empty. This is unnecessary and weird.

Which issue(s) this PR fixes:
None

Special notes for your reviewer:
None

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 23, 2020
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 23, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Jun 24, 2020

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2020
@EppO
Copy link
Contributor

EppO commented Jun 29, 2020

maybe the default in roles/kubernetes/master/defaults/main/main.yml is not really relevant then?

kube_api_runtime_config: []

checking with defined although the default is always defined feels wrong to me.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, 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:

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

@floryut
Copy link
Member Author

floryut commented Jun 30, 2020

kube_api_runtime_config

Indeed, I've aligned with other params like kube_apiserver_disable_admission_plugins or kube_apiserver_enable_admission_plugins

@EppO
Copy link
Contributor

EppO commented Jun 30, 2020

I think it's cleaner this way
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2020
@k8s-ci-robot k8s-ci-robot merged commit 2a82dff into kubernetes-sigs:master Jun 30, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Jun 30, 2020
* 'master' of https://github.com/kubernetes-sigs/kubespray: (22 commits)
  Remove runtime-config from kubeadm if empty (kubernetes-sigs#6311)
  Update deprecated api (kubernetes-sigs#6245)
  Update kube-router to 1.0.0 (kubernetes-sigs#6211)
  Fix kubelet cgroup driver detection for crio (kubernetes-sigs#6331)
  Update hashes and set default version to 1.18.5 (kubernetes-sigs#6335)
  Change MetalLB to one of addons (kubernetes-sigs#6238)
  Update calico to 1.15.0 + minor update to kube-ovn/weave (kubernetes-sigs#6306)
  Add .editorconfig file (kubernetes-sigs#6307)
  Use NetworkManager to manage resolv.conf in FedoraCoreOS (kubernetes-sigs#6291)
  Add USE_REAL_HOSTNAME to inventory.py (kubernetes-sigs#6293)
  Cleanup OpenStack network things (kubernetes-sigs#6283)
  Add support for dns_etchosts (kubernetes-sigs#6236)
  kube_encryption_resources must be output as yaml (kubernetes-sigs#6309)
  Gather ansible_default_ipv4 for specific groups (kubernetes-sigs#6318)
  added azure_cloud parameter to Azure's cloud_config (kubernetes-sigs#6321)
  Fix some doc links (kubernetes-sigs#6328)
  Use `connection: local` when `delegate_to: localhost` (kubernetes-sigs#6322)
  Add /dev volume (kubernetes-sigs#6319)
  Update cilium to 1.8.0 (kubernetes-sigs#6314)
  fix use of ansible tags (kubernetes-sigs#6316)
  ...
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants