From 4af66462fb1e8630aed482552322fa4ebfcd53b6 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 30 Jun 2020 13:38:37 +0200
Subject: split up standalone kubelet role into base and pod

---
 .../templates/cni-no-portmap.conflist.j2           | 17 ---------------
 .../cni-with-localonly-portmap.conflist.j2         | 25 ----------------------
 .../templates/cni-with-portmap.conflist.j2         | 23 --------------------
 .../standalone/templates/kubelet-config.yml.j2     | 25 ----------------------
 .../templates/kubelet.service.override.j2          | 10 ---------
 5 files changed, 100 deletions(-)
 delete mode 100644 roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2
 delete mode 100644 roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2
 delete mode 100644 roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2
 delete mode 100644 roles/kubernetes/standalone/templates/kubelet-config.yml.j2
 delete mode 100644 roles/kubernetes/standalone/templates/kubelet.service.override.j2

(limited to 'roles/kubernetes/standalone/templates')

diff --git a/roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2 b/roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2
deleted file mode 100644
index be47f216..00000000
--- a/roles/kubernetes/standalone/templates/cni-no-portmap.conflist.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "cniVersion": "0.3.1",
-  "name": "kube-standalone",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "kube-bridge",
-      "isDefaultGateway": true,
-      "ipMasq": true,
-      "hairpinMode": false,
-      "ipam": {
-        "type": "host-local",
-        "subnet": "{{ kubernetes_standalone_pod_cidr }}"
-      }
-    }
-  ]
-}
diff --git a/roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2 b/roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2
deleted file mode 100644
index acaf7eba..00000000
--- a/roles/kubernetes/standalone/templates/cni-with-localonly-portmap.conflist.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "cniVersion": "0.3.1",
-  "name": "kube-standalone",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "kube-bridge",
-      "isDefaultGateway": true,
-      "ipMasq": true,
-      "hairpinMode": false,
-      "ipam": {
-        "type": "host-local",
-        "subnet": "{{ kubernetes_standalone_pod_cidr }}"
-      }
-    }, {
-      "type": "portmap",
-      "capabilities": {
-        "portMappings": true
-      },
-      "snat": true,
-      "conditionsV4": ["-s", "127.0.0.1", "-d", "127.0.0.1"],
-      "conditionsV6": ["-s", "::1", "-d", "::1"]
-    }
-  ]
-}
diff --git a/roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2 b/roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2
deleted file mode 100644
index 9f9b2b9a..00000000
--- a/roles/kubernetes/standalone/templates/cni-with-portmap.conflist.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "cniVersion": "0.3.1",
-  "name": "kube-standalone",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "kube-bridge",
-      "isDefaultGateway": true,
-      "ipMasq": true,
-      "hairpinMode": false,
-      "ipam": {
-        "type": "host-local",
-        "subnet": "{{ kubernetes_standalone_pod_cidr }}"
-      }
-    }, {
-      "type": "portmap",
-      "capabilities": {
-        "portMappings": true
-      },
-      "snat": true
-    }
-  ]
-}
diff --git a/roles/kubernetes/standalone/templates/kubelet-config.yml.j2 b/roles/kubernetes/standalone/templates/kubelet-config.yml.j2
deleted file mode 100644
index d6af0f24..00000000
--- a/roles/kubernetes/standalone/templates/kubelet-config.yml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-{# https://godoc.org/k8s.io/kubelet/config/v1beta1#KubeletConfiguration #}
-{#  #}
-kind: KubeletConfiguration
-apiVersion: kubelet.config.k8s.io/v1beta1
-staticPodPath: /etc/kubernetes/manifests
-address: {{ kubernetes_standalone_address }}
-port: {{ kubernetes_standalone_port }}
-readOnlyPort: {{ kubernetes_standalone_readonly_port }}
-healthzBindAddress: {{ kubernetes_standalone_healthz_address }}
-healthzPort: {{ kubernetes_standalone_healthz_port }}
-authentication:
-  anonymous:
-    enabled: true
-  webhook:
-    enabled: false
-authorization:
-  mode: AlwaysAllow
-maxPods: {{ kubernetes_standalone_max_pods }}
-makeIPTablesUtilChains: false
-hairpinMode: none
-resolvConf: {{ kubernetes_standalone_resolv_conf }}
-cgroupDriver: systemd
-enableControllerAttachDetach: false
-featureGates:
-  RuntimeClass: false
diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/templates/kubelet.service.override.j2
deleted file mode 100644
index fe8bfb4c..00000000
--- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/bin/kubelet \
-  --config=/etc/kubernetes/kubelet.yml \
-{% if kubernetes_cri_socket %}
-  --container-runtime=remote \
-  --container-runtime-endpoint={{ kubernetes_cri_socket }} \
-{% endif %}
-  --network-plugin=cni \
-  --cloud-provider=
-- 
cgit v1.2.3