%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}
%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}
- metrics_server
- prometheus
- sriovdp
- - svcwatcher
- - netwatcher
- fluentd
- - danm-webhook
+ - hyperdanm
infra_chart_separated_values:
- fluentd
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:
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:
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:
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
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 }}