From 351d4fb27360511eb2850e556ab702402b235a3d Mon Sep 17 00:00:00 2001
From: Scott <sbws@google.com>
Date: Thu, 25 Oct 2018 12:16:25 -0400
Subject: [PATCH] feat(appengine): unflag container image url deployments
 (#5894)

---
 .../serverGroup/configure/wizard/basicSettings.controller.ts   | 3 ---
 .../src/serverGroup/configure/wizard/basicSettings.html        | 2 +-
 halconfig/settings.js                                          | 2 --
 settings.js                                                    | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts
index 2b5d5a51c21..aa2c7e89317 100644
--- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts
+++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.controller.ts
@@ -3,7 +3,6 @@ import { StateService } from '@uirouter/angularjs';
 import { set } from 'lodash';
 
 import {
-  SETTINGS,
   ArtifactTypePatterns,
   ExpectedArtifactSelectorViewController,
   NgAppEngineDeployArtifactDelegate,
@@ -17,8 +16,6 @@ interface IAppengineBasicSettingsScope extends IScope {
 }
 
 class AppengineServerGroupBasicSettingsCtrl implements IController {
-  public containerImageUrlEnabled = SETTINGS.providers.appengine.defaults.containerImageUrlDeployments;
-
   constructor(
     public $scope: IAppengineBasicSettingsScope,
     $state: StateService,
diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html
index 0499d52bd2d..a4c6d93bdb2 100644
--- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html
+++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/basicSettings.html
@@ -76,7 +76,7 @@
                    value="gcs" /> GCS
           </label>
         </div>
-        <div class="radio radio-inline" ng-if="basicSettingsCtrl.containerImageUrlEnabled">
+        <div class="radio radio-inline">
           <label>
             <input type="radio"
                    ng-model="command.sourceType"
diff --git a/halconfig/settings.js b/halconfig/settings.js
index 59d9f13f795..a6d3d68e7fa 100644
--- a/halconfig/settings.js
+++ b/halconfig/settings.js
@@ -29,7 +29,6 @@ var timezone = '{%timezone%}';
 var version = '{%version%}';
 var changelogGistId = '{%changelog.gist.id%}';
 var changelogGistName = '{%changelog.gist.name%}';
-var appengineContainerImageUrlDeploymentsEnabled = '{%features.appengineContainerImageUrlDeployments%}' === 'true';
 var gce = {
   defaults: {
     account: '{%google.default.account%}',
@@ -51,7 +50,6 @@ var appengine = {
   defaults: {
     account: '{%appengine.default.account%}',
     editLoadBalancerStageEnabled: '{%appengine.enabled%}' === 'true',
-    containerImageUrlDeployments: appengineContainerImageUrlDeploymentsEnabled,
   },
 };
 var openstack = {
diff --git a/settings.js b/settings.js
index 45f98a6438c..c0b1a75cd0c 100644
--- a/settings.js
+++ b/settings.js
@@ -132,7 +132,6 @@ window.spinnakerSettings = {
     appengine: {
       defaults: {
         account: 'my-appengine-account',
-        containerImageUrlDeployments: false,
       },
     },
   },