From 8264a0cd96da6ba811164bbb5c73b20528a2e603 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 29 May 2019 14:20:17 -0700 Subject: [PATCH] ci-operator/templates/openshift: Drop networking from install-config.yaml In places where we were not overriding installer defaults. This minimizes divergence between the clusters tested by CI and the clusters folk will get with a minimal or wizard-generated install-config. --- .../cluster-launch-installer-console.yaml | 8 -------- .../installer/cluster-launch-installer-e2e.yaml | 8 -------- .../cluster-launch-installer-metal-e2e.yaml | 2 -- .../cluster-launch-installer-openstack-e2e.yaml | 7 ------- .../installer/cluster-launch-installer-src.yaml | 16 ---------------- .../cluster-launch-installer-upi-e2e.yaml | 8 +------- .../cluster-scaleup-e2e-40.yaml | 8 -------- 7 files changed, 1 insertion(+), 56 deletions(-) diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml index b40a31929ff2c..7654434a71965 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml @@ -249,14 +249,6 @@ objects: zones: - us-east-1a - us-east-1b - networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: 10.0.0.0/16 - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN platform: aws: region: ${AWS_REGION} diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index e24774c1911b4..f4262c29bfda3 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -434,14 +434,6 @@ objects: zones: - us-east-1a - us-east-1b - networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: 10.0.0.0/16 - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN platform: aws: region: ${AWS_REGION} diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml index 48f0390126073..edb7ac55ed350 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml @@ -243,8 +243,6 @@ objects: controlPlane: name: master replicas: 3 - networking: - networkType: OpenShiftSDN platform: none: {} pullSecret: > diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml index b1c56dc4ab989..186a90754ab69 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml @@ -254,13 +254,6 @@ objects: baseDomain: ${BASE_DOMAIN} metadata: name: ${CLUSTER_NAME} - networking: - clusterNetworks: - - cidr: 10.128.0.0/14 - hostSubnetLength: 9 - machineCIDR: 10.0.0.0/16 - serviceCIDR: 172.30.0.0/16 - type: OpenShiftSDN platform: openstack: baseImage: ${OPENSTACK_IMAGE} diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index ff9e7bb754f9b..41c622c3d1d92 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -245,14 +245,6 @@ objects: zones: - us-east-1a - us-east-1b - networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: 10.0.0.0/16 - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN platform: aws: region: ${AWS_REGION} @@ -269,14 +261,6 @@ objects: baseDomain: ${BASE_DOMAIN} metadata: name: ${CLUSTER_NAME} - networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: 10.0.0.0/16 - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN platform: openstack: baseImage: ${OPENSTACK_IMAGE} diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml index 424086824558a..6daeb5763e716 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml @@ -332,13 +332,7 @@ objects: - ${AWS_REGION}b - ${AWS_REGION}c networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: "${MACHINE_CIDR}" - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN + machineCIDR: ${MACHINE_CIDR} platform: aws: region: ${AWS_REGION} diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml index ec029192b0665..0db6c75436645 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml @@ -248,14 +248,6 @@ objects: zones: - us-east-1a - us-east-1b - networking: - clusterNetwork: - - cidr: 10.128.0.0/14 - hostPrefix: 23 - machineCIDR: 10.0.0.0/16 - serviceNetwork: - - 172.30.0.0/16 - networkType: OpenShiftSDN platform: aws: region: ${AWS_REGION}