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.

Sign up for GitHub

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

sources: update to handlebars v4 #1707

Merged
merged 1 commit into from
Aug 11, 2021
Merged

sources: update to handlebars v4 #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/containerd/containerd-config-toml_k8s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ SystemdCgroup = true
bin_dir = "/opt/cni/bin"
conf_dir = "/etc/cni/net.d"

{{~#if settings.container-registry.mirrors}}
{{~#each settings.container-registry.mirrors}}
{{#if settings.container-registry.mirrors}}
{{#each settings.container-registry.mirrors}}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{@key}}"]
endpoint = [{{join_array ", " this }}]
{{~/each}}
{{~/if}}
{{/each}}
{{/if}}
4 changes: 2 additions & 2 deletions packages/docker-engine/daemon-json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"data-root": "/var/lib/docker",
"selinux-enabled": true,
"default-ulimits": { "nofile": { "Name": "nofile", "Soft": 1024, "Hard": 4096 } }
{{~#if settings.container-registry.mirrors.[docker.io]}},
{{#if settings.container-registry.mirrors.[docker.io]}},
"registry-mirrors": [{{join_array ", " settings.container-registry.mirrors.[docker.io]}}]
{{~/if}}
{{/if}}
}
8 changes: 4 additions & 4 deletions packages/kubernetes-1.17/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apiVersion: v1
kind: Config
clusters:
- cluster:
{{~#if settings.kubernetes.api-server}}
{{#if settings.kubernetes.api-server}}
certificate-authority: "/etc/kubernetes/pki/ca.crt"
server: "{{settings.kubernetes.api-server}}"
{{~/if}}
{{/if}}
name: kubernetes
contexts:
- context:
Expand All @@ -16,7 +16,7 @@ contexts:
current-context: kubelet
users:
- name: kubelet
{{~#if settings.kubernetes.bootstrap-token}}
{{#if settings.kubernetes.bootstrap-token}}
user:
token: "{{settings.kubernetes.bootstrap-token}}"
{{~/if}}
{{/if}}
84 changes: 42 additions & 42 deletions packages/kubernetes-1.17/kubelet-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
kind: KubeletConfiguration
apiVersion: kubelet.config.k8s.io/v1beta1
{{~#if settings.kubernetes.standalone-mode}}
{{#if settings.kubernetes.standalone-mode}}
address: 127.0.0.1
authentication:
anonymous:
Expand All @@ -10,7 +10,7 @@ authentication:
enabled: false
authorization:
mode: AlwaysAllow
{{~else}}
{{else}}
address: 0.0.0.0
authentication:
anonymous:
Expand All @@ -25,67 +25,67 @@ authorization:
webhook:
cacheAuthorizedTTL: 5m0s
cacheUnauthorizedTTL: 30s
{{~/if}}
{{/if}}
clusterDomain: {{settings.kubernetes.cluster-domain}}
{{~#if settings.kubernetes.cluster-dns-ip}}
{{#if settings.kubernetes.cluster-dns-ip}}
clusterDNS:
- {{settings.kubernetes.cluster-dns-ip}}
{{~/if}}
{{~#if settings.kubernetes.eviction-hard}}
{{/if}}
{{#if settings.kubernetes.eviction-hard}}
evictionHard:
{{~#each settings.kubernetes.eviction-hard}}
{{#each settings.kubernetes.eviction-hard}}
{{@key}}: "{{this}}"
{{~/each}}
{{~/if}}
{{~#if settings.kubernetes.allowed-unsafe-sysctls}}
{{/each}}
{{/if}}
{{#if settings.kubernetes.allowed-unsafe-sysctls}}
allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}}
{{~/if}}
{{~#if settings.kubernetes.registry-qps includeZero=true}}
{{/if}}
{{#if settings.kubernetes.registry-qps includeZero=true}}
registryPullQPS: {{settings.kubernetes.registry-qps}}
{{~/if}}
{{~#if settings.kubernetes.registry-burst includeZero=true}}
{{/if}}
{{#if settings.kubernetes.registry-burst includeZero=true}}
registryBurst: {{settings.kubernetes.registry-burst}}
{{~/if}}
{{~#if settings.kubernetes.event-qps includeZero=true}}
{{/if}}
{{#if settings.kubernetes.event-qps includeZero=true}}
eventRecordQPS: {{settings.kubernetes.event-qps}}
{{~/if}}
{{~#if settings.kubernetes.event-burst includeZero=true}}
{{/if}}
{{#if settings.kubernetes.event-burst includeZero=true}}
eventBurst: {{settings.kubernetes.event-burst}}
{{~/if}}
{{~#if settings.kubernetes.kube-api-qps includeZero=true}}
{{/if}}
{{#if settings.kubernetes.kube-api-qps includeZero=true}}
kubeAPIQPS: {{settings.kubernetes.kube-api-qps}}
{{~/if}}
{{~#if settings.kubernetes.kube-api-burst includeZero=true}}
{{/if}}
{{#if settings.kubernetes.kube-api-burst includeZero=true}}
kubeAPIBurst: {{settings.kubernetes.kube-api-burst}}
{{~/if}}
{{/if}}
kubeReserved:
cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}"
{{~#if settings.kubernetes.kube-reserved.memory}}
{{#if settings.kubernetes.kube-reserved.memory}}
memory: "{{settings.kubernetes.kube-reserved.memory}}"
{{~else}}
{{~#if settings.kubernetes.max-pods}}
{{else}}
{{#if settings.kubernetes.max-pods}}
memory: "{{kube_reserve_memory settings.kubernetes.max-pods settings.kubernetes.kube-reserved.memory}}"
{{~/if}}
{{~/if}}
{{/if}}
{{/if}}
ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}"
kubeReservedCgroup: "/runtime"
{{~#if settings.kubernetes.system-reserved}}
{{#if settings.kubernetes.system-reserved}}
systemReserved:
{{~#each settings.kubernetes.system-reserved}}
{{#each settings.kubernetes.system-reserved}}
{{@key}}: "{{this}}"
{{~/each}}
{{/each}}
systemReservedCgroup: "/system"
{{~/if}}
{{/if}}
cpuManagerPolicy: {{default "none" settings.kubernetes.cpu-manager-policy}}
{{~#if settings.kubernetes.cpu-manager-reconcile-period}}
{{#if settings.kubernetes.cpu-manager-reconcile-period}}
cpuManagerReconcilePeriod: {{settings.kubernetes.cpu-manager-reconcile-period}}
{{~/if}}
{{~#if settings.kubernetes.topology-manager-scope}}
{{/if}}
{{#if settings.kubernetes.topology-manager-scope}}
topologyManagerScope: {{settings.kubernetes.topology-manager-scope}}
{{~/if}}
{{~#if settings.kubernetes.topology-manager-policy}}
{{/if}}
{{#if settings.kubernetes.topology-manager-policy}}
topologyManagerPolicy: {{settings.kubernetes.topology-manager-policy}}
{{~/if}}
{{/if}}
resolvConf: "/etc/resolv.conf"
hairpinMode: hairpin-veth
readOnlyPort: 0
Expand All @@ -103,9 +103,9 @@ tlsCipherSuites:
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
maxPods: {{default 110 settings.kubernetes.max-pods}}
staticPodPath: "/etc/kubernetes/static-pods/"
{{~#if settings.kubernetes.container-log-max-size includeZero=true}}
{{#if settings.kubernetes.container-log-max-size includeZero=true}}
containerLogMaxSize: {{settings.kubernetes.container-log-max-size}}
{{~/if}}
{{~#if settings.kubernetes.container-log-max-files includeZero=true}}
{{/if}}
{{#if settings.kubernetes.container-log-max-files includeZero=true}}
containerLogMaxFiles: {{settings.kubernetes.container-log-max-files}}
{{~/if}}
{{/if}}
10 changes: 5 additions & 5 deletions packages/kubernetes-1.17/kubelet-exec-start-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[Service]
ExecStart=
ExecStart=/usr/bin/kubelet \
{{~#unless settings.kubernetes.standalone-mode}}
{{#unless settings.kubernetes.standalone-mode}}
--cloud-provider {{default "external" settings.kubernetes.cloud-provider}} \
--kubeconfig /etc/kubernetes/kubelet/kubeconfig \
{{~#if (eq settings.kubernetes.authentication-mode "tls")}}
{{#if (eq settings.kubernetes.authentication-mode "tls")}}
--bootstrap-kubeconfig /etc/kubernetes/kubelet/bootstrap-kubeconfig \
{{~/if}}
{{~else}}
{{/if}}
{{else}}
--cloud-provider "" \
{{~/unless}}
{{/unless}}
--config /etc/kubernetes/kubelet/config \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/dockershim.sock \
Expand Down
16 changes: 8 additions & 8 deletions packages/kubernetes-1.17/kubelet-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apiVersion: v1
kind: Config
clusters:
- cluster:
{{~#if settings.kubernetes.api-server}}
{{#if settings.kubernetes.api-server}}
certificate-authority: "/etc/kubernetes/pki/ca.crt"
server: "{{settings.kubernetes.api-server}}"
{{~/if}}
{{/if}}
name: kubernetes
contexts:
- context:
Expand All @@ -16,8 +16,8 @@ contexts:
current-context: kubelet
users:
- name: kubelet
{{~#if (eq settings.kubernetes.authentication-mode "aws")}}
{{~#if settings.kubernetes.cluster-name}}
{{#if (eq settings.kubernetes.authentication-mode "aws")}}
{{#if settings.kubernetes.cluster-name}}
user:
exec:
apiVersion: client.authentication.k8s.io/v1alpha1
Expand All @@ -26,10 +26,10 @@ users:
- token
- "-i"
- "{{settings.kubernetes.cluster-name}}"
{{~/if}}
{{~/if}}
{{~#if (eq settings.kubernetes.authentication-mode "tls")}}
{{/if}}
{{/if}}
{{#if (eq settings.kubernetes.authentication-mode "tls")}}
user:
client-certificate: "/var/lib/kubelet/pki/kubelet-client-current.pem"
client-key: "/var/lib/kubelet/pki/kubelet-client-current.pem"
{{~/if}}
{{/if}}
8 changes: 4 additions & 4 deletions packages/kubernetes-1.18/kubelet-bootstrap-kubeconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apiVersion: v1
kind: Config
clusters:
- cluster:
{{~#if settings.kubernetes.api-server}}
{{#if settings.kubernetes.api-server}}
certificate-authority: "/etc/kubernetes/pki/ca.crt"
server: "{{settings.kubernetes.api-server}}"
{{~/if}}
{{/if}}
name: kubernetes
contexts:
- context:
Expand All @@ -16,7 +16,7 @@ contexts:
current-context: kubelet
users:
- name: kubelet
{{~#if settings.kubernetes.bootstrap-token}}
{{#if settings.kubernetes.bootstrap-token}}
user:
token: "{{settings.kubernetes.bootstrap-token}}"
{{~/if}}
{{/if}}
Loading