summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/consul/components/consul-server/Chart.yaml (renamed from kubernetes/consul/charts/consul-server/Chart.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/requirements.yaml (renamed from kubernetes/consul/charts/consul-server/requirements.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/NOTES.txt (renamed from kubernetes/consul/charts/consul-server/templates/NOTES.txt)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/service.yaml (renamed from kubernetes/consul/charts/consul-server/templates/service.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/templates/statefulset.yaml (renamed from kubernetes/consul/charts/consul-server/templates/statefulset.yaml)0
-rw-r--r--kubernetes/consul/components/consul-server/values.yaml (renamed from kubernetes/consul/charts/consul-server/values.yaml)0
-rw-r--r--kubernetes/consul/requirements.yaml4
-rw-r--r--kubernetes/msb/templates/serviceaccout.yaml2
8 files changed, 5 insertions, 1 deletions
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index 8a94ed5b68..8a94ed5b68 100644
--- a/kubernetes/consul/charts/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
index 6963d207e7..6963d207e7 100644
--- a/kubernetes/consul/charts/consul-server/requirements.yaml
+++ b/kubernetes/consul/components/consul-server/requirements.yaml
diff --git a/kubernetes/consul/charts/consul-server/templates/NOTES.txt b/kubernetes/consul/components/consul-server/templates/NOTES.txt
index 157fe92427..157fe92427 100644
--- a/kubernetes/consul/charts/consul-server/templates/NOTES.txt
+++ b/kubernetes/consul/components/consul-server/templates/NOTES.txt
diff --git a/kubernetes/consul/charts/consul-server/templates/service.yaml b/kubernetes/consul/components/consul-server/templates/service.yaml
index c24ddfb7e4..c24ddfb7e4 100644
--- a/kubernetes/consul/charts/consul-server/templates/service.yaml
+++ b/kubernetes/consul/components/consul-server/templates/service.yaml
diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/components/consul-server/templates/statefulset.yaml
index 16fda3a510..16fda3a510 100644
--- a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml
+++ b/kubernetes/consul/components/consul-server/templates/statefulset.yaml
diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/components/consul-server/values.yaml
index 48a26effd7..48a26effd7 100644
--- a/kubernetes/consul/charts/consul-server/values.yaml
+++ b/kubernetes/consul/components/consul-server/values.yaml
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index 2161e6e16e..bde1c36b17 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -23,3 +23,7 @@ dependencies:
- name: repositoryGenerator
version: ~7.x-0
repository: '@local'
+ - name: consul-server
+ version: ~7.x-0
+ repository: 'file://components/consul-server'
+ condition: cds-command-executor.enabled
diff --git a/kubernetes/msb/templates/serviceaccout.yaml b/kubernetes/msb/templates/serviceaccout.yaml
index ae1886239a..3248a0f12c 100644
--- a/kubernetes/msb/templates/serviceaccout.yaml
+++ b/kubernetes/msb/templates/serviceaccout.yaml
@@ -19,7 +19,7 @@ metadata:
name: msb
namespace: {{ include "common.namespace" . }}
---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "common.namespace" . }}-msb-binding