Update #1

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.

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

Merged

cfBrianMiller merged 68 commits into CloudFitSoftware:master from openshift:master

Apr 2, 2020

cmd/openshift-install/create.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,7 +14,6 @@ import (
  
    	"github.com/sirupsen/logrus"

    	"github.com/spf13/cobra"

    	corev1 "k8s.io/api/core/v1"

    	apierrors "k8s.io/apimachinery/pkg/api/errors"

    	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

    	"k8s.io/apimachinery/pkg/fields"

    	"k8s.io/apimachinery/pkg/util/wait"

    @@ -200,13 +199,9 @@ func addRouterCAToClusterCA(config *rest.Config, directory string) (err error) {
  
    	}

    	// Configmap may not exist. log and accept not-found errors with configmap.

    	caConfigMap, err := client.CoreV1().ConfigMaps("openshift-config-managed").Get("router-ca", metav1.GetOptions{})

    	caConfigMap, err := client.CoreV1().ConfigMaps("openshift-config-managed").Get("default-ingress-cert", metav1.GetOptions{})

    	if err != nil {

    		if apierrors.IsNotFound(err) {

    			logrus.Infof("router-ca resource not found in cluster, perhaps you are not using default router CA")

    			return nil

    		}

    		return errors.Wrap(err, "fetching router-ca configmap from openshift-config-managed namespace")

    		return errors.Wrap(err, "fetching default-ingress-cert configmap from openshift-config-managed namespace")

    	}

    	routerCrtBytes := []byte(caConfigMap.Data["ca-bundle.crt"])

    @@ -230,7 +225,7 @@ func addRouterCAToClusterCA(config *rest.Config, directory string) (err error) {
  
    			return errors.New("cluster CA found in kubeconfig not valid PEM format")

    		}

    		if !certPool.AppendCertsFromPEM(routerCrtBytes) {

    			return errors.New("ca-bundle.crt from router-ca configmap not valid PEM format")

    			return errors.New("ca-bundle.crt from default-ingress-cert configmap not valid PEM format")

    		}

    		newCA := append(routerCrtBytes, clusterCABytes...)

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

-Original file line number
+Diff line change
@@ Expand Up / @@ -347,6 +347,7 @@ then @@
     		${CLOUD_CREDENTIAL_OPERATOR_IMAGE} \
     		render \
     			--dest-dir=/assets/cco-bootstrap \
+    			--manifests-dir=/assets/manifests \
     			--cloud-credential-operator-image=${CLOUD_CREDENTIAL_OPERATOR_IMAGE}
     	cp cco-bootstrap/manifests/* manifests/
@@ Expand Down @@

data/data/openstack/main.tf

-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ module "masters" { @@
       )
       root_volume_size = var.openstack_master_root_volume_size
       root_volume_type = var.openstack_master_root_volume_type
+      server_group_id  = var.openstack_master_server_group_id
     }
     module "topology" {
@@ Expand Down @@

data/data/openstack/masters/main.tf

-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,10 @@ resource "openstack_compute_instance_v2" "master_conf" { @@
         port = var.master_port_ids[count.index]
       }
+      scheduler_hints {
+        group = var.server_group_id
+      }
       metadata = {
         # FIXME(mandre) shouldn't it be "${var.cluster_id}-master-${count.index}" ?
         Name = "${var.cluster_id}-master"
@@ Expand Down @@

data/data/openstack/masters/variables.tf

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,3 +40,8 @@ variable "root_volume_type" { @@
       type        = string
       description = "The type of volume for the root block device."
     }
+    variable "server_group_id" {
+      type        = string
+      description = "ID of the server group to assign the servers to."
+    }

data/data/openstack/variables-openstack.tf

-Original file line number
+Diff line change
@@ Expand Up @@
     EOF
     }
+    variable "openstack_master_server_group_id" {
+      type        = string
+      description = "ID of the server group to assign the master servers to."
+    }

data/data/vsphere/bootstrap/main.tf

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ resource "vsphere_virtual_machine" "vm" { @@
       extra_config = {
         "guestinfo.ignition.config.data"          = base64encode(var.ignition)
         "guestinfo.ignition.config.data.encoding" = "base64"
+        "guestinfo.hostname"                      = "${var.cluster_id}-bootstrap"
       }
       tags = var.tags
     }
@@ Expand Down @@

data/data/vsphere/master/ignition.tf

This file was deleted.

data/data/vsphere/master/main.tf

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,8 +30,9 @@ resource "vsphere_virtual_machine" "vm" { @@
       }
       extra_config = {
-        "guestinfo.ignition.config.data"          = base64encode(data.ignition_config.ign[count.index].rendered)
+        "guestinfo.ignition.config.data"          = base64encode(var.ignition)
         "guestinfo.ignition.config.data.encoding" = "base64"
+        "guestinfo.hostname"                      = "${var.cluster_id}-${var.name}-${count.index}"
       }
       tags = var.tags
@@ Expand Down @@

docs/design/resource_dep.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

docs/dev/openstack/customization.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,6 +13,15 @@ export OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE="https://example.com/my-rhcos.qcow2"
  
    **NOTE:** For this to work, the environment variable value must be a valid http(s) URL.

    If the user wants to upload the image from the local file system, he can set the environment variable value as `file:///path/to/file`. In this case the installer will take this file and automatically create an image in Glance.

    Example:

    ```sh

    export OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE="file:///home/user/rhcos.qcow2"

    ./openshift-install create cluster --dir ostest

    ```

    If the user wants to reuse an existing Glance image without any uploading of binary data, then it is possible to set `OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE` environment variable that specifies the Glance image name. In this case no new Glance images will be created, and the image will stay when the cluster is destroyed.

    Example:

    @@ -22,4 +31,4 @@ export OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE="my-rhcos"
  
    ./openshift-install create cluster --dir ostest

    ```

    **NOTE:** The only difference in behavior with the previous example is that the value here is not an http(s) URL.

    **NOTE:** The only difference in behavior with the previous examples is that the value here is not an "http(s)" or "file" URL.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!