Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/cdi/cdi-operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
{{- include "helm_lib_module_labels" (list .) | nindent 2 }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-operator" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
name: cdi-operator
namespace: d8-{{ .Chart.Name }}
spec:
Expand Down
11 changes: 10 additions & 1 deletion templates/cdi/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,17 @@ spec:
type: strategic
{{- end }}

# Add kube-api-rewriter as a sidecar container to cdi-apiserver and cdi-deployment.
# set labels for components
- resourceType: Deployment
resourceName: cdi-deployment
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-deployment" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic
- resourceType: Deployment
resourceName: cdi-apiserver
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "cdi-apiserver" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic

# Add kube-api-rewriter as a sidecar container to cdi-apiserver and cdi-deployment.
{{- $apiRewriterSettings := dict }}
{{- $_ := set $apiRewriterSettings "WEBHOOK_ADDRESS" "https://127.0.0.1:8443" }}
{{- $_ := set $apiRewriterSettings "WEBHOOK_CERT_FILE" "/var/run/certs/cdi-apiserver-server-cert/tls.crt" }}
Expand Down
2 changes: 1 addition & 1 deletion templates/dvcr/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
{{- include "helm_lib_module_labels" (list . (dict "app" "dvcr")) | nindent 2 }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "dvcr" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
name: dvcr
namespace: d8-{{ .Chart.Name }}
spec:
Expand Down
18 changes: 18 additions & 0 deletions templates/kubevirt/kubevirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,24 @@ spec:
patch: '[{"op": "replace", "path": "/spec/ports/0/targetPort", "value": "https-metrics"}]'
type: json

# set labels for components
- resourceType: Deployment
resourceName: virt-api
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-api" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic
- resourceType: Deployment
resourceName: virt-operator
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-operator" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic
- resourceType: Deployment
resourceName: virt-controller
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-controller" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic
- resourceType: DaemonSet
resourceName: virt-handler
patch: '{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-handler" "app.kubernetes.io/component" "dvp")) | fromYaml | toJson }}'
type: strategic

# Additional environment variables for virt-controller.
{{ define "virt-controller-additional-envs" }}
env:
Expand Down
2 changes: 1 addition & 1 deletion templates/kubevirt/virt-operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
{{- include "helm_lib_module_labels" (list . (dict "app" "virt-operator")) | nindent 2 }}
name: virt-operator
namespace: d8-{{ .Chart.Name }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virt-operator" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
spec:
{{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
revisionHistoryLimit: 2
Expand Down
2 changes: 1 addition & 1 deletion templates/virtualization-api/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ kind: Deployment
metadata:
name: virtualization-api
namespace: d8-{{ .Chart.Name }}
{{- include "helm_lib_module_labels" (list . (dict "app" "virtualization-api")) | nindent 2 }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virtualization-api" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
spec:
{{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
revisionHistoryLimit: 2
Expand Down
2 changes: 1 addition & 1 deletion templates/virtualization-controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ kind: Deployment
metadata:
name: virtualization-controller
namespace: d8-{{ .Chart.Name }}
{{- include "helm_lib_module_labels" (list . (dict "app" "virtualization-controller")) | nindent 2 }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "virtualization-controller" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
spec:
{{- include "helm_lib_deployment_strategy_and_replicas_for_ha" . | nindent 2 }}
revisionHistoryLimit: 2
Expand Down
2 changes: 1 addition & 1 deletion templates/vm-route-forge/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ kind: DaemonSet
metadata:
name: vm-route-forge
namespace: d8-{{ .Chart.Name }}
{{- include "helm_lib_module_labels" (list . (dict "app" "vm-route-forge")) | nindent 2 }}
{{- include "helm_lib_module_labels" (list . (dict "app.kubernetes.io/name" "vm-route-forge" "app.kubernetes.io/component" "dvp")) | nindent 2 }}
spec:
selector:
matchLabels:
Expand Down
Loading