ci-operator/templates/openshift: Drop networking from install-config.yaml

[wking]

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.

[vrutkovs]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• ci-operator/templates/openshift/installer/OWNERS [wking]
• ci-operator/templates/openshift/openshift-ansible/OWNERS [vrutkovs]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@wking: Updated the following 14 configmaps:

• prow-job-cluster-launch-installer-console configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-console.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml
• prow-job-cluster-launch-installer-metal-e2e configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-metal-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
• prow-job-cluster-scaleup-e2e-40 configmap in namespace ci using the following files:
  • key cluster-scaleup-e2e-40.yaml using file ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
• prow-job-cluster-scaleup-e2e-40 configmap in namespace ci-stg using the following files:
  • key cluster-scaleup-e2e-40.yaml using file ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
• prow-job-cluster-launch-installer-console configmap in namespace ci using the following files:
  • key cluster-launch-installer-console.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml
• prow-job-cluster-launch-installer-e2e configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
• prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci using the following files:
  • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
• prow-job-cluster-launch-installer-src configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-src.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
• prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
• prow-job-cluster-launch-installer-metal-e2e configmap in namespace ci using the following files:
  • key cluster-launch-installer-metal-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
• prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci-stg using the following files:
  • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
• prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci using the following files:
  • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
• prow-job-cluster-launch-installer-e2e configmap in namespace ci using the following files:
  • key cluster-launch-installer-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
• prow-job-cluster-launch-installer-src configmap in namespace ci using the following files:
  • key cluster-launch-installer-src.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

Details

In response to this:

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.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[abhinavdahiya]

$ ./bin/openshift-install --dir dev create install-config
? SSH Public Key /home/adahiya/.ssh/id_rsa_libvirt.pub
? Platform libvirt
? Libvirt Connection URI qemu+tcp://192.168.122.1/system
? Base Domain tt.testing
? Cluster Name adahiya
? Pull Secret [? for help] *********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
$ cat dev/install-config.yaml
apiVersion: v1
baseDomain: tt.testing
compute:
- hyperthreading: Enabled
  name: worker
  platform: {}
  replicas: 1
controlPlane:
  hyperthreading: Enabled
  name: master
  platform: {}
  replicas: 1
metadata:
  creationTimestamp: null
  name: adahiya
networking:
  clusterNetwork:
  - cidr: 10.128.0.0/14
    hostPrefix: 23
  machineCIDR: 192.168.126.0/24
  networkType: OpenShiftSDN
  serviceNetwork:
  - 172.30.0.0/16
platform:
  libvirt:
    URI: qemu+tcp://192.168.122.1/system
    network:
      if: tt0
pullSecret: 'xxxx'
sshKey: |
  xxxxx

This minimizes divergence between the clusters tested by CI and the clusters folk will get with a minimal or wizard-generated install-config.

It looks like the install-config provided to users by create install-config contains the replicas and networking. So there is no divergence.

[openshift-ci-robot]

@wking: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/rehearse/openshift/builder/master/e2e-aws	8264a0c	link	/test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-aws-scaleup-rhel7	8264a0c	link	/test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-vsphere	8264a0c	link	/test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-aws-upi	8264a0c	link	/test pj-rehearse
ci/prow/pj-rehearse	8264a0c	link	/test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.