From 77a40971ce16a59f0cd826c37b64f89432cad222 Mon Sep 17 00:00:00 2001 From: Krisztian Lengyel Date: Mon, 5 Aug 2019 14:21:04 +0200 Subject: [PATCH] Use hyperdanm container image for DANM components Change-Id: I58dc193126846803830f0992511a2acec0439b7c Depends-On: Ibd777facef06d2e97c9358c5440e2bc8a3d2f930 Signed-off-by: Krisztian Lengyel --- SPECS/infra-charts.spec | 2 +- SPECS/instantiate.spec | 2 +- ansible/roles/install_caas_infra/defaults/main.yaml | 4 +--- infra-charts/templates/danm-webhook-ds.yaml | 2 +- infra-charts/templates/netwatcher.yaml | 2 +- infra-charts/templates/svcwatcher.yaml | 2 +- infra-charts/values.yaml.j2 | 6 +++--- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec index a01d9af..71a614e 100644 --- a/SPECS/infra-charts.spec +++ b/SPECS/infra-charts.spec @@ -15,7 +15,7 @@ %define COMPONENT infra-charts %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 17 +%define RPM_MINOR_VERSION 18 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} diff --git a/SPECS/instantiate.spec b/SPECS/instantiate.spec index 64659a9..9e1658e 100644 --- a/SPECS/instantiate.spec +++ b/SPECS/instantiate.spec @@ -15,7 +15,7 @@ %define COMPONENT instantiate %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 11 +%define RPM_MINOR_VERSION 12 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} diff --git a/ansible/roles/install_caas_infra/defaults/main.yaml b/ansible/roles/install_caas_infra/defaults/main.yaml index d8af266..3e710f2 100644 --- a/ansible/roles/install_caas_infra/defaults/main.yaml +++ b/ansible/roles/install_caas_infra/defaults/main.yaml @@ -20,9 +20,7 @@ infra_chart_images: - metrics_server - prometheus - sriovdp - - svcwatcher - - netwatcher - fluentd - - danm-webhook + - hyperdanm infra_chart_separated_values: - fluentd diff --git a/infra-charts/templates/danm-webhook-ds.yaml b/infra-charts/templates/danm-webhook-ds.yaml index 2d898e6..72cac41 100644 --- a/infra-charts/templates/danm-webhook-ds.yaml +++ b/infra-charts/templates/danm-webhook-ds.yaml @@ -37,7 +37,7 @@ spec: nodetype: caas_master containers: - name: danm-webhook - image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/danm-webhook:{{ .Values.danm_webhook.container_version }} + image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/hyperdanm:{{ .Values.danm_webhook.container_version }} command: [ "/usr/local/bin/webhook", "-tls-cert-bundle=/etc/webhook/certs/danm_webhook.crt", "-tls-private-key-file=/etc/webhook/certs/danm_webhook.key", "-bind-port={{ .Values.danm_webhook.webhook_target_port }}" ] imagePullPolicy: IfNotPresent volumeMounts: diff --git a/infra-charts/templates/netwatcher.yaml b/infra-charts/templates/netwatcher.yaml index 1299c3e..cc8037c 100644 --- a/infra-charts/templates/netwatcher.yaml +++ b/infra-charts/templates/netwatcher.yaml @@ -33,7 +33,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: netwatcher - image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/netwatcher:{{ .Values.netwatcher.container_version }} + image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/hyperdanm:{{ .Values.netwatcher.container_version }} securityContext: capabilities: add: diff --git a/infra-charts/templates/svcwatcher.yaml b/infra-charts/templates/svcwatcher.yaml index dbb5d22..ec62be4 100644 --- a/infra-charts/templates/svcwatcher.yaml +++ b/infra-charts/templates/svcwatcher.yaml @@ -35,7 +35,7 @@ spec: nodetype: caas_master containers: - name: svcwatcher - image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/svcwatcher:{{ .Values.svcwatcher.container_version }} + image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/hyperdanm:{{ .Values.svcwatcher.container_version }} args: - "--logtostderr" resources: diff --git a/infra-charts/values.yaml.j2 b/infra-charts/values.yaml.j2 index 6698ccd..df7dec5 100644 --- a/infra-charts/values.yaml.j2 +++ b/infra-charts/values.yaml.j2 @@ -43,10 +43,10 @@ custom_metrics_api: svcwatcher: required: true - container_version: {{ container_image_names | select('search', '/svcwatcher') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} + container_version: {{ container_image_names | select('search', '/hyperdanm') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} netwatcher: - container_version: {{ container_image_names | select('search', '/netwatcher') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} + container_version: {{ container_image_names | select('search', '/hyperdanm') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} cpupooler: required: true @@ -61,7 +61,7 @@ cpupooler: danm_webhook: required: true - container_version: {{ container_image_names | select('search', '/danm-webhook') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} + container_version: {{ container_image_names | select('search', '/hyperdanm') | list | last | regex_replace('.*:([\\w\\-_\\.]+)$', '\\1') }} webhook_ca_bundle: {{ webhooks_ca }} webhook_port: {{ caas.danm_webhook_port }} webhook_target_port: {{ caas.danm_webhook_target_port }} -- 2.16.6