github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/cluster
History
Kubernetes Submit Queue a8c81a98c6
Merge pull request #66685 from cadmuxe/fix_calico_custom_yaml 
Automatic merge from submit-queue (batch tested with PRs 63955, 66685, 66671). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add KUBE_CUSTOM_CALICO_NODE_DAEMONSET_YAML and KUBE_CUSTOM_TYPHA_DEPL…

**What this PR does / why we need it**:
PR https://github.com/kubernetes/kubernetes/pull/65024 Add a helper function to customize K8s addon yamls and use it to customize Calico addons on GKE. 

This PR will expose CUSTOM_CALICO_NODE_DAEMONSET_YAML and CUSTOM_TYPHA_DEPLOYMENT_YAML so that we can easily overwrite calico yamls on k8s opensource. 

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONRE
```
 		2018-07-26 21:05:09 -07:00
..
addons Bump Heapster to v1.5.4 2018-07-26 15:31:26 +02:00
centos Disable initializers by default 2018-07-10 15:14:32 -04:00
gce Add KUBE_CUSTOM_CALICO_NODE_DAEMONSET_YAML and KUBE_CUSTOM_TYPHA_DEPLOYMENT_YAML 2018-07-26 11:59:00 -07:00
images more clear err log 2018-07-18 16:10:53 +08:00
juju Merge pull request #66039 from liggitt/disable-initializers 2018-07-12 17:57:12 -07:00
kubemark Adding IKS functionality to kubemark 2018-07-23 11:42:22 -04:00
kubernetes-anywhere Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
local Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
log-dump Fix dumping logs with logexporter 2018-07-02 15:24:25 +02:00
pre-existing Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
skeleton Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
BUILD Add unit test for configure-helper. 2018-04-23 12:18:57 -07:00
OWNERS
…
README.md
…
clientbin.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
common.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
get-kube-binaries.sh
…
get-kube-local.sh Implement fixes for flexvolume when kubelet is contanerized 2018-07-03 14:04:52 -04:00
get-kube.sh Remove salt support for providers that no longer exist. 2018-01-12 15:51:23 -08:00
kube-down.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kube-up.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kube-util.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubeadm.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubectl.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
restore-from-backup.sh Remove references to the Debian-based Container-VM image 2018-07-03 17:05:31 -07:00
test-e2e.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-network.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-smoke.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-storage-objects.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
validate-cluster.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00

README.md

Cluster Configuration

Deprecation Notice: This directory has entered maintenance mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics