From 7753a1836f518d3111bf63f613dceecbec42b760 Mon Sep 17 00:00:00 2001 From: Josh Wood Date: Mon, 10 Jul 2017 14:13:48 -0700 Subject: [PATCH 1/2] Doc/install/b-m/index: Update req'd CL version ask for and show CL 1353.8.0 --- Documentation/install/bare-metal/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/install/bare-metal/index.md b/Documentation/install/bare-metal/index.md index 36096d5863..5f6adb4d27 100644 --- a/Documentation/install/bare-metal/index.md +++ b/Documentation/install/bare-metal/index.md @@ -81,7 +81,7 @@ Matchbox can serve CoreOS Container Linux images to reduce bandwidth usage and i Download a recent CoreOS Container Linux stable [release][coreos-release] with signatures. ```sh -$ ./scripts/get-coreos stable 1353.7.0 . # note the "." 3rd argument +$ ./scripts/get-coreos stable 1353.8.0 . # note the "." 3rd argument ``` Move the images to `/var/lib/matchbox/assets`, @@ -94,7 +94,7 @@ $ sudo cp -r coreos /var/lib/matchbox/assets $ tree /var/lib/matchbox/assets /var/lib/matchbox/assets/ ├── coreos -│   └── 1353.7.0 +│   └── 1353.8.0 │   ├── CoreOS_Image_Signing_Key.asc │   ├── coreos_production_image.bin.bz2 │   ├── coreos_production_image.bin.bz2.sig From 1515d1a7e1a771317d73b40280bc704abc971d2b Mon Sep 17 00:00:00 2001 From: Matt Kaniaris Date: Mon, 10 Jul 2017 14:20:52 -0700 Subject: [PATCH 2/2] frontend: removes split-dns off option... because it does not work --- installer/frontend/components/aws-vpc.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/frontend/components/aws-vpc.jsx b/installer/frontend/components/aws-vpc.jsx index 9a7536a3f2..4bab5797c6 100644 --- a/installer/frontend/components/aws-vpc.jsx +++ b/installer/frontend/components/aws-vpc.jsx @@ -49,7 +49,7 @@ import { SERVICE_CIDR, toVPCSubnetID, SPLIT_DNS_ON, - SPLIT_DNS_OPTIONS, + // SPLIT_DNS_OPTIONS, } from '../cluster-config'; const vpcInfoForm = new Form(AWS_VPC_FORM, [ @@ -235,7 +235,7 @@ class AWS_VPCComponent extends React.Component { } render () { - const { availableVpcs, awsCreateVpc, availableVpcSubnets, awsVpcId, clusterName, clusterSubdomain, internalCluster, advanced, privateZone } = this.props; + const { availableVpcs, awsCreateVpc, availableVpcSubnets, awsVpcId, clusterName, clusterSubdomain, internalCluster, advanced } = this.props; let controllerSubnets; let workerSubnets; @@ -355,7 +355,7 @@ class AWS_VPCComponent extends React.Component { - { !privateZone && + {/* privateZone &&
@@ -369,7 +369,7 @@ class AWS_VPCComponent extends React.Component {

- } + */}