Merge "add PetSet support"
diff --git a/README.rst b/README.rst
index e2be335..c81b3d7 100644
--- a/README.rst
+++ b/README.rst
@@ -430,6 +430,21 @@
mount: /certs
path: /etc/certs
+PetSet manifest
+---------------------
+
+.. code-block:: yaml
+
+ service:
+ memcached:
+ apiVersion: apps/v1alpha1
+ kind: PetSet
+ service_name: 'memcached'
+ container:
+ memcached:
+ ...
+
+
Configmap
---------
diff --git a/kubernetes/files/kube-proxy/proxy.kubeconfig b/kubernetes/files/kube-proxy/proxy.kubeconfig
index 68e231c..4fb09d6 100644
--- a/kubernetes/files/kube-proxy/proxy.kubeconfig
+++ b/kubernetes/files/kube-proxy/proxy.kubeconfig
@@ -11,7 +11,7 @@
name: proxy-to-cluster.local
clusters:
- cluster:
- certificate-authority: /etc/kubernetes/ssl/ca-{{ pool.ca }}.crt
+ certificate-authority: /etc/kubernetes/ssl/kubelet-client.crt
# server: https://{{ pool.apiserver.host }}:443
name: cluster.local
users:
diff --git a/kubernetes/files/kubelet/kubelet.kubeconfig b/kubernetes/files/kubelet/kubelet.kubeconfig
index d2375a6..7b68dc9 100644
--- a/kubernetes/files/kubelet/kubelet.kubeconfig
+++ b/kubernetes/files/kubelet/kubelet.kubeconfig
@@ -6,7 +6,7 @@
preferences: {}
clusters:
- cluster:
- certificate-authority: /etc/kubernetes/ssl/ca-{{ pool.ca }}.crt
+ certificate-authority: /etc/kubernetes/ssl/kubelet-client.crt
# server: https://{{ pool.apiserver.host }}:443
name: cluster.local
contexts:
diff --git a/kubernetes/files/rc.yml b/kubernetes/files/rc.yml
index e012918..5863863 100644
--- a/kubernetes/files/rc.yml
+++ b/kubernetes/files/rc.yml
@@ -8,6 +8,9 @@
app: {{ service.service }}-{{ service.role }}
spec:
replicas: {{ service.replicas }}
+ {%- if service.kind == 'PetSet' %}
+ serviceName: {{ service.service_name }}
+ {%- endif %}
template:
metadata:
labels: