Skip to content

Commit

Permalink
[release-4.14] Support shielded nodes (VMs) for GCP (#8976)
Browse files Browse the repository at this point in the history
Signed-off-by: Itzhak Kave <[email protected]>
  • Loading branch information
openshift-cherrypick-robot authored Dec 4, 2023
1 parent 076f9a5 commit b6adff9
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 1 deletion.
17 changes: 17 additions & 0 deletions conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_compute.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
DEPLOYMENT:
allow_lower_instance_requirements: false
ENV_DATA:
platform: 'gcp'
deployment_type: 'ipi'
region: 'europe-west1'
base_domain: 'gcp.qe.rh-ocs.com'
gcp_project_id: 'odf-qe'
worker_replicas: 3
master_replicas: 3
master_instance_type: 'n2-standard-16'
worker_instance_type: 'n2-standard-16'
worker_secure_boot: 'Enabled'
REPORTING:
polarion:
deployment_id: 'OCS-2372'
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
DEPLOYMENT:
allow_lower_instance_requirements: false
ENV_DATA:
platform: 'gcp'
deployment_type: 'ipi'
region: 'europe-west1'
base_domain: 'gcp.qe.rh-ocs.com'
gcp_project_id: 'odf-qe'
worker_replicas: 3
master_replicas: 3
master_instance_type: 'n2-standard-16'
worker_instance_type: 'n2-standard-16'
master_secure_boot: 'Enabled'
REPORTING:
polarion:
deployment_id: 'OCS-2372'
17 changes: 17 additions & 0 deletions conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
DEPLOYMENT:
allow_lower_instance_requirements: false
ENV_DATA:
platform: 'gcp'
deployment_type: 'ipi'
region: 'europe-west1'
base_domain: 'gcp.qe.rh-ocs.com'
gcp_project_id: 'odf-qe'
worker_replicas: 3
master_replicas: 3
master_instance_type: 'n2-standard-16'
worker_instance_type: 'n2-standard-16'
machine_secure_boot: 'Enabled'
REPORTING:
polarion:
deployment_id: 'OCS-2372'
3 changes: 2 additions & 1 deletion ocs_ci/ocs/platform_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -3068,4 +3068,5 @@ def restart_nodes_by_stop_and_start_teardown(self):
"""
not_ready_nodes = get_nodes_in_statuses([constants.NODE_NOT_READY])
node_names = [n.name for n in not_ready_nodes]
self.gcp.start_instances(node_names)
if node_names:
self.gcp.start_instances(node_names)
10 changes: 10 additions & 0 deletions ocs_ci/templates/ocp-deployment/install-config-gcp-ipi.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ compute:
platform:
gcp:
type: {{ worker_instance_type }}
{% if worker_secure_boot %}
secureBoot: {{ worker_secure_boot }}
{% endif %}
{% if worker_availability_zones %}
zones:
{% for zone in worker_availability_zones %}
Expand All @@ -17,6 +20,9 @@ controlPlane:
platform:
gcp:
type: {{ master_instance_type }}
{% if master_secure_boot %}
secureBoot: {{ master_secure_boot }}
{% endif %}
{% if master_availability_zones %}
zones:
{% for zone in master_availability_zones %}
Expand All @@ -42,4 +48,8 @@ platform:
gcp:
projectID: {{ gcp_project_id }}
region: {{ region }}
{% if machine_secure_boot %}
defaultMachinePlatform:
secureBoot: {{ machine_secure_boot }}
{% endif %}
pullSecret: ''

0 comments on commit b6adff9

Please sign in to comment.