feat(appengine): unflag container image url deployments (spinnaker#5894)

christopherthielen · Oct 25, 2018 · 351d4fb · 351d4fb
1 parent 7fa3504
commit 351d4fb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 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
@@ -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
@@ -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
@@ -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
@@ -132,7 +132,6 @@ window.spinnakerSettings = {
     appengine: {
       defaults: {
         account: 'my-appengine-account',
-        containerImageUrlDeployments: false,
       },
     },
   },