diff options
Diffstat (limited to 'kud')
7 files changed, 44 insertions, 28 deletions
diff --git a/kud/hosting_providers/vagrant/README.md b/kud/hosting_providers/vagrant/README.md index f0210149..3d0766b3 100644 --- a/kud/hosting_providers/vagrant/README.md +++ b/kud/hosting_providers/vagrant/README.md @@ -23,6 +23,14 @@ its usage. This script supports two Virtualization technologies $ sudo ./setup.sh -p libvirt +There is a `default.yml` in the `./config` directory which creates multiple controllers and nodes. +There are also sample configurations in the `./config/samples` directory. To use one of the samples, +copy it into the `./config` directory as `pdf.yml`. If a `pdf.yml` exists in the `./config` +directory it overrides the `default.yml` when the `vagrant up` command (in the next step) is run. +For example: + + $ cp ./config/samples/pdf.yml.aio ./config/pdf.yml + Once Vagrant is installed, it's possible to provision a cluster using the following instructions: diff --git a/kud/hosting_providers/vagrant/setup.sh b/kud/hosting_providers/vagrant/setup.sh index 00b6e86f..79bf60c4 100755 --- a/kud/hosting_providers/vagrant/setup.sh +++ b/kud/hosting_providers/vagrant/setup.sh @@ -107,7 +107,7 @@ case ${ID,,} in case $VAGRANT_DEFAULT_PROVIDER in virtualbox) - echo "deb http://download.virtualbox.org/virtualbox/debian trusty contrib" >> /etc/apt/sources.list + echo "deb http://download.virtualbox.org/virtualbox/debian bionic contrib" >> /etc/apt/sources.list wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add - wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add - packages+=(virtualbox-5.1 dkms) diff --git a/kud/tests/m3db-operator-test.sh b/kud/tests/m3db-operator-test.sh index 5642fb69..1962c3f3 100755 --- a/kud/tests/m3db-operator-test.sh +++ b/kud/tests/m3db-operator-test.sh @@ -25,11 +25,15 @@ source _common_test.sh source _functions.sh source _common.sh +# base_url_orchestrator=${base_url_orchestrator:-"http://localhost:9015/v2"} +# base_url_clm=${base_url_clm:-"http://localhost:9019/v2"} +# base_url_ncm=${base_url_ncm:-"http://localhost:9016/v2"} +base_url_orchestrator=${base_url_orchestrator:-"http://192.168.121.29:30356/v2"} base_url_clm=${base_url_clm:-"http://192.168.121.29:32551/v2"} base_url_ncm=${base_url_ncm:-"http://192.168.121.29:31406/v2"} -base_url_orchestrator=${base_url_orchestrator:-"http://192.168.121.29:30356/v2"} -base_url_rysnc=${base_url_orchestrator:-"http://192.168.121.29:31751/v2"} +base_url_rysnc=${base_url_rysnc:-"http://192.168.121.29:31751/v2"} + CSAR_DIR="/opt/csar" csar_id="operators-cb009bfe-bbee-11e8-9766-525400435678" diff --git a/kud/tests/vfw-test-setenv.sh b/kud/tests/vfw-test-setenv.sh index 77031f9f..4d2a0078 100644 --- a/kud/tests/vfw-test-setenv.sh +++ b/kud/tests/vfw-test-setenv.sh @@ -1,7 +1,8 @@ export packetgen_helm_path=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/packetgen.tar.gz export firewall_helm_path=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/firewall.tar.gz export sink_helm_path=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/sink.tar.gz -export kubeconfigfile=/home/vagrant/multicloud-k8s/cluster-configs/config-edge02 +export kubeconfigfile=/home/vagrant/multicloud-k8s/cluster-configs/config-edge01 +export kubeconfigfile2=/home/vagrant/multicloud-k8s/cluster-configs/config-edge02 export packetgen_profile_targz=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/profile.tar.gz export firewall_profile_targz=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/profile.tar.gz export sink_profile_targz=/home/vagrant/multicloud-k8s/kud/demo/composite-firewall/profile.tar.gz diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml index 8c42b26f..2cccb2b2 100644 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml +++ b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml @@ -1,4 +1,6 @@ {{- if .Values.deployments.etcdOperator }} +# Synced with https://github.com/coreos/etcd-operator/blob/master/pkg/util/k8sutil/crd.go +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -23,3 +25,27 @@ spec: shortNames: - etcd {{- end }} +{{- if .Values.customResources.createEtcdClusterCRD }} +--- +apiVersion: "etcd.database.coreos.com/v1beta2" +kind: "EtcdCluster" +metadata: + name: {{ .Values.etcdCluster.name }} + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: {{ template "etcd-operator.name" . }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} + annotations: + "helm.sh/hook": "post-install" + "helm.sh/hook-delete-policy": "before-hook-creation" +spec: + size: {{ .Values.etcdCluster.size }} + version: "{{ .Values.etcdCluster.version }}" + pod: +{{ toYaml .Values.etcdCluster.pod | indent 4 }} + {{- if .Values.etcdCluster.enableTLS }} + TLS: +{{ toYaml .Values.etcdCluster.tls | indent 4 }} + {{- end }} +{{- end }}
\ No newline at end of file diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml deleted file mode 100644 index 471bfac0..00000000 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/templates/etcd-cluster-creation.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.customResources.createEtcdClusterCRD }} -apiVersion: "etcd.database.coreos.com/v1beta2" -kind: "EtcdCluster" -metadata: - name: {{ .Values.etcdCluster.name }} - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - app: {{ template "etcd-operator.name" . }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": "post-install" - "helm.sh/hook-delete-policy": "before-hook-creation" -spec: - size: {{ .Values.etcdCluster.size }} - version: "{{ .Values.etcdCluster.version }}" - pod: -{{ toYaml .Values.etcdCluster.pod | indent 4 }} - {{- if .Values.etcdCluster.enableTLS }} - TLS: -{{ toYaml .Values.etcdCluster.tls | indent 4 }} - {{- end }} -{{- end }} diff --git a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml index e698f338..90947807 100644 --- a/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml +++ b/kud/tests/vnfs/comp-app/collection/operators/helm/operator/charts/etcd-operator/values.yaml @@ -37,7 +37,7 @@ deployments: # you could use `helm template --values <values.yaml> --name release_name ... ` # and create the resources yourself to deploy on your cluster later customResources: - createEtcdClusterCRD: false + createEtcdClusterCRD: true createBackupCRD: false createRestoreCRD: false |