Skip to content

Update ocp4_workload_virt_roadshow_vms for defensive coding with to_json #9627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Update ocp4_workload_virt_roadshow_vms for defensive coding with to_json #9627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...oles_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/namespace.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
name: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
{% endfor %}
4 changes: 2 additions & 2 deletions ...es_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/rolebinding.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: admin
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: admin
subjects:
- apiGroup: rbac.authorization.k8s.io
kind: User
name: {{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
name: {{ (ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
{% endfor %}
2 changes: 1 addition & 1 deletion ...s_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/route_webapp.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: route-webapp
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
to:
kind: Service
Expand Down
2 changes: 1 addition & 1 deletion ...p_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_database.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: v1
kind: Service
metadata:
name: database
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
selector:
vm.kubevirt.io/name: database
Expand Down
2 changes: 1 addition & 1 deletion ...ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/service_webapp.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
name: webapp
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
selector:
env: webapp
Expand Down
11 changes: 5 additions & 6 deletions ...es_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_database.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app: database
app.kubernetes.io/part-of: 3-Tier-App
name: database
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -19,12 +19,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/database.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/database.qcow2') | to_json }}
storage:
resources:
requests:
storage: 16Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
metadata:
annotations:
Expand All @@ -36,8 +36,7 @@ spec:
kubevirt.io/size: small
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
cpu:
Expand All @@ -62,7 +61,7 @@ spec:
bootloader:
bios: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 2Gi
Expand Down
11 changes: 5 additions & 6 deletions ...es_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb01.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
vm.kubevirt.io/template.revision: '1'
vm.kubevirt.io/template.version: v0.25.0
name: winweb01
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -19,12 +19,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb01.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb01.qcow2') | to_json }}
storage:
resources:
requests:
storage: 90Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
{% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %}
metadata:
Expand All @@ -33,8 +33,7 @@ spec:
{% endif %}
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
clock:
Expand Down Expand Up @@ -87,7 +86,7 @@ spec:
bootloader:
efi: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 6Gi
Expand Down
11 changes: 5 additions & 6 deletions ...es_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/multi_user/vm_winweb02.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
vm.kubevirt.io/template.revision: '1'
vm.kubevirt.io/template.version: v0.25.0
name: winweb02
namespace: {{ ocp4_workload_virt_roadshow_vms_base_namespace }}{{ ocp4_workload_virt_roadshow_vms_userbase }}{{ user_number }}
namespace: {{ (ocp4_workload_virt_roadshow_vms_base_namespace ~ ocp4_workload_virt_roadshow_vms_userbase ~ user_number) | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -19,12 +19,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb02.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb02.qcow2') | to_json }}
storage:
resources:
requests:
storage: 90Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
{% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %}
metadata:
Expand All @@ -33,8 +33,7 @@ spec:
{% endif %}
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
clock:
Expand Down Expand Up @@ -87,7 +86,7 @@ spec:
bootloader:
efi: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 6Gi
Expand Down
2 changes: 1 addition & 1 deletion ...les_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/namespace.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ ocp4_workload_virt_roadshow_vms_namespace }}
name: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
2 changes: 1 addition & 1 deletion ..._ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/route_webapp.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: route-webapp
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
to:
kind: Service
Expand Down
2 changes: 1 addition & 1 deletion ..._workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_database.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
name: database
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
selector:
vm.kubevirt.io/name: database
Expand Down
2 changes: 1 addition & 1 deletion ...cp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/service_webapp.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: webapp
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
selector:
env: webapp
Expand Down
11 changes: 5 additions & 6 deletions ...s_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_database.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app: database
app.kubernetes.io/part-of: 3-Tier-App
name: database
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -18,12 +18,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/database.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ /database.qcow2) | to_json }}
storage:
resources:
requests:
storage: 16Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
metadata:
annotations:
Expand All @@ -35,8 +35,7 @@ spec:
kubevirt.io/size: small
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
cpu:
Expand All @@ -61,7 +60,7 @@ spec:
bootloader:
bios: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 2Gi
Expand Down
11 changes: 5 additions & 6 deletions ...s_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb01.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
vm.kubevirt.io/template.revision: '1'
vm.kubevirt.io/template.version: v0.25.0
name: winweb01
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -18,12 +18,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb01.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb01.qcow2') | to_json }}
storage:
resources:
requests:
storage: 90Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
{% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %}
metadata:
Expand All @@ -32,8 +32,7 @@ spec:
{% endif %}
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
clock:
Expand Down Expand Up @@ -86,7 +85,7 @@ spec:
bootloader:
efi: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 6Gi
Expand Down
11 changes: 5 additions & 6 deletions ...s_ocp_workloads/ocp4_workload_virt_roadshow_vms/templates/single_user/vm_winweb02.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
vm.kubevirt.io/template.revision: '1'
vm.kubevirt.io/template.version: v0.25.0
name: winweb02
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace }}
namespace: {{ ocp4_workload_virt_roadshow_vms_namespace | to_json }}
spec:
dataVolumeTemplates:
- apiVersion: cdi.kubevirt.io/v1beta1
Expand All @@ -18,12 +18,12 @@ spec:
spec:
source:
http:
url: {{ ocp4_workload_virt_roadshow_vms_image_url }}/winweb02.qcow2
url: {{ (ocp4_workload_virt_roadshow_vms_image_url ~ '/winweb02.qcow2') | to_json }}
storage:
resources:
requests:
storage: 90Gi
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool }}
running: {{ ocp4_workload_virt_roadshow_vms_start_vms | bool | to_json }}
template:
{% if not ocp4_workload_virt_roadshow_vms_roadshow_setup | bool %}
metadata:
Expand All @@ -32,8 +32,7 @@ spec:
{% endif %}
spec:
{% if ocp4_workload_virt_roadshow_vms_node_selector_enabled | bool %}
nodeSelector:
{{ ocp4_workload_virt_roadshow_vms_node_selector }}
nodeSelector: {{ ocp4_workload_virt_roadshow_vms_node_selector | to_json }}
{% endif %}
domain:
clock:
Expand Down Expand Up @@ -86,7 +85,7 @@ spec:
bootloader:
efi: {}
machine:
type: {{ ocp4_workload_virt_roadshow_vms_machine_type }}
type: {{ ocp4_workload_virt_roadshow_vms_machine_type | to_json }}
resources:
requests:
memory: 6Gi
Expand Down
Loading