Merge pull request #1348 from amrutac/cp-remove-dns-option

Cherry picks ui change for the installer and docs change
coreos · Jul 10, 2017 · ed3e089 · ed3e089
2 parents 2891af1 + 1515d1a
commit ed3e089
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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

diff --git 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 {
           </div>
         </div>
       </div>
-      { !privateZone &&
+      {/* privateZone &&
         <div className="row form-group">
           <div className="col-xs-offset-3 col-xs-9">
             <Connect field={AWS_SPLIT_DNS}>
@@ -369,7 +369,7 @@ class AWS_VPCComponent extends React.Component {
             </p>
           </div>
         </div>
-      }
+      */}
 
       <vpcInfoForm.Errors/>
       <AWS_DomainValidation />