From 2cdd48e990ee57c6126995451fa997b79edfbf8c Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Wed, 8 Mar 2017 20:14:55 -0500 Subject: [PATCH] Swithcing nova-compute-ironic to use statefulset Swithcing nova-compute-ironic to use statefulset Change-Id: I8f6de41e0d8d7b46cfc4144b2ddfafaef1e5b3a3 --- .../Chart.yaml | 2 +- .../requirements.yaml | 0 .../templates/nova-compute-ironic.yaml | 12 ++++++------ helm/service/nova-compute-ironic/requirements.yaml | 4 ++-- helm/service/nova-compute-ironic/values.yaml | 2 +- tests/bin/deploy_ironic.sh | 4 ++-- tools/setup_kubernetes.sh | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename helm/microservice/{nova-compute-ironic-daemonset => nova-compute-ironic-statefulset}/Chart.yaml (88%) rename helm/microservice/{nova-compute-ironic-daemonset => nova-compute-ironic-statefulset}/requirements.yaml (100%) rename helm/microservice/{nova-compute-ironic-daemonset => nova-compute-ironic-statefulset}/templates/nova-compute-ironic.yaml (90%) diff --git a/helm/microservice/nova-compute-ironic-daemonset/Chart.yaml b/helm/microservice/nova-compute-ironic-statefulset/Chart.yaml similarity index 88% rename from helm/microservice/nova-compute-ironic-daemonset/Chart.yaml rename to helm/microservice/nova-compute-ironic-statefulset/Chart.yaml index b34dbca90..74f4c8f26 100644 --- a/helm/microservice/nova-compute-ironic-daemonset/Chart.yaml +++ b/helm/microservice/nova-compute-ironic-statefulset/Chart.yaml @@ -1,4 +1,4 @@ -name: nova-compute-ironic-daemonset +name: nova-compute-ironic-statefulset version: 0.6.0-1 description: Chart for nova compute ironic microservice keywords: diff --git a/helm/microservice/nova-compute-ironic-daemonset/requirements.yaml b/helm/microservice/nova-compute-ironic-statefulset/requirements.yaml similarity index 100% rename from helm/microservice/nova-compute-ironic-daemonset/requirements.yaml rename to helm/microservice/nova-compute-ironic-statefulset/requirements.yaml diff --git a/helm/microservice/nova-compute-ironic-daemonset/templates/nova-compute-ironic.yaml b/helm/microservice/nova-compute-ironic-statefulset/templates/nova-compute-ironic.yaml similarity index 90% rename from helm/microservice/nova-compute-ironic-daemonset/templates/nova-compute-ironic.yaml rename to helm/microservice/nova-compute-ironic-statefulset/templates/nova-compute-ironic.yaml index 304788b39..343b8df2b 100644 --- a/helm/microservice/nova-compute-ironic-daemonset/templates/nova-compute-ironic.yaml +++ b/helm/microservice/nova-compute-ironic-statefulset/templates/nova-compute-ironic.yaml @@ -1,4 +1,4 @@ -{{- $searchPath := ":global.kolla.nova.compute-ironic.daemonset:global.kolla.nova.compute-ironic.all:global.kolla.nova.all:global.kolla.all" }} +{{- $searchPath := ":global.kolla.nova.compute-ironic.statefulset:global.kolla.nova.compute-ironic.all:global.kolla.nova.all:global.kolla.all" }} {{- $resourceName := "nova-compute-ironic" }} {{- $netHostTrue := false }} {{- $podTypeBootstrap := false }} @@ -15,16 +15,16 @@ {{- $selectorKey := include "kolla_val_get_str" (dict "key" "selector_key" "searchPath" $searchPath "Values" .Values ) }} {{- $selectorValue := include "kolla_val_get_str" (dict "key" "selector_value" "searchPath" $searchPath "Values" .Values ) }} {{- $tunnelInterface := "eth0" }} +{{- $replicas := include "kolla_val_get_str" (dict "key" "replicas" "searchPath" $searchPath "Values" .Values ) }} {{- $elementName := .Values.element_name | default $resourceName }} {{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "imageFull" $imageFull "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "privileged" $privileged "Values" .Values "Release" .Release "searchPath" $searchPath }} -apiVersion: extensions/v1beta1 -kind: DaemonSet +apiVersion: apps/v1beta1 +kind: StatefulSet metadata: name: {{ $elementName }} - labels: - component: {{ $serviceName }} - system: {{ $elementName }} spec: + serviceName: {{ $elementName }} + replicas: {{ $replicas }} template: metadata: labels: diff --git a/helm/service/nova-compute-ironic/requirements.yaml b/helm/service/nova-compute-ironic/requirements.yaml index 522abeebc..43d6a4394 100644 --- a/helm/service/nova-compute-ironic/requirements.yaml +++ b/helm/service/nova-compute-ironic/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: nova-compute-ironic-daemonset - repository: file://../../microservice/nova-compute-ironic-daemonset + - name: nova-compute-ironic-statefulset + repository: file://../../microservice/nova-compute-ironic-statefulset version: 0.6.0-1 diff --git a/helm/service/nova-compute-ironic/values.yaml b/helm/service/nova-compute-ironic/values.yaml index 442f0da17..0a1e136dd 100644 --- a/helm/service/nova-compute-ironic/values.yaml +++ b/helm/service/nova-compute-ironic/values.yaml @@ -4,7 +4,7 @@ global: kubernetes_entrypoint: true nova: compute-ironic: - daemonset: + statefulset: dependencies: service: - nova-metadata diff --git a/tests/bin/deploy_ironic.sh b/tests/bin/deploy_ironic.sh index a369bf0d1..5503c8315 100755 --- a/tests/bin/deploy_ironic.sh +++ b/tests/bin/deploy_ironic.sh @@ -84,8 +84,8 @@ helm install kolla/ironic-conductor-daemonset --version $VERSION \ --namespace kolla --name ironic-conductor-daemonset \ --values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml -helm install kolla/nova-compute-ironic-daemonset --version $VERSION \ - --namespace kolla --name nova-compute-ironic-daemonset \ +helm install kolla/nova-compute-ironic-statefulset --version $VERSION \ + --namespace kolla --name nova-compute-ironic-statefulset \ --values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml $DIR/tools/pull_containers.sh kolla diff --git a/tools/setup_kubernetes.sh b/tools/setup_kubernetes.sh index db325a567..cecba16a8 100755 --- a/tools/setup_kubernetes.sh +++ b/tools/setup_kubernetes.sh @@ -8,7 +8,7 @@ cat <<"EOEF" > /etc/yum.repos.d/kubernetes.repo name=Kubernetes baseurl=http://yum.kubernetes.io/repos/kubernetes-el7-x86_64 enabled=1 -gpgcheck=1 +gpgcheck=0 repo_gpgcheck=1 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg