diff --git a/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts b/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts index bf58df5749b..f9b255d4029 100644 --- a/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts +++ b/app/scripts/modules/appengine/src/helpContents/appengineHelpContents.ts @@ -69,6 +69,15 @@ const helpContents = [ value: `The full URL to the container image to use for deployment. The URL must be one of the valid GCR hostnames, for example gcr.io/my-project/image:tag`, }, + { + key: 'appengine.serverGroup.suppress-version-string', + value: `Spinnaker automatically versions your server groups. This means deployments through Spinnaker receive a + short version string at the end of their name, like "v001". In most cases you will want to keep this + version as part of the name. Preventing this string from being added to your server group will stop + it from being considered when rolling back, promoting new versions or executing deployment strategies. + If you are certain that you do not want the version string applied to this server group then check + this box.`, + }, { key: 'appengine.loadBalancer.shardBy.cookie', value: diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts index 31943cd67e2..72ca9eafb8e 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts +++ b/app/scripts/modules/appengine/src/serverGroup/configure/serverGroupCommandBuilder.service.ts @@ -38,6 +38,7 @@ export interface IAppengineServerGroupCommand { selectedProvider: string; promote?: boolean; stopPreviousVersion?: boolean; + suppressVersionString?: boolean; type?: string; backingData: any; viewState: IViewState; diff --git a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html index 78981d8836f..54ab279a272 100644 --- a/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html +++ b/app/scripts/modules/appengine/src/serverGroup/configure/wizard/advancedSettings.html @@ -22,4 +22,14 @@ + +
+
+ Supress Version String + +
+
+ +
+
diff --git a/app/scripts/modules/appengine/src/serverGroup/transformer.ts b/app/scripts/modules/appengine/src/serverGroup/transformer.ts index 2aa7f657407..e81558c99f2 100644 --- a/app/scripts/modules/appengine/src/serverGroup/transformer.ts +++ b/app/scripts/modules/appengine/src/serverGroup/transformer.ts @@ -35,6 +35,7 @@ export class AppengineDeployDescription { public sourceType: string; public storageAccountName?: string; public containerImageUrl?: string; + public suppressVersionString?: boolean; constructor(command: IAppengineServerGroupCommand) { this.credentials = command.credentials; @@ -64,6 +65,7 @@ export class AppengineDeployDescription { this.sourceType = command.sourceType; this.storageAccountName = command.storageAccountName; this.containerImageUrl = command.containerImageUrl; + this.suppressVersionString = command.suppressVersionString; } }