Upgrade note and swagger for restoring automatic=false behavior in 1.4

openshift · Oct 8, 2016 · be1a0f8 · be1a0f8
1 parent b04b468
commit be1a0f8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -102,4 +102,5 @@ references:
 
 1. The `deploymentConfig.spec.strategy.rollingParams.updatePercent` field is removed in
   favor of `deploymentConfig.spec.strategy.rollingParams.maxUnavailable` and
-  `deploymentConfig.spec.strategy.rollingParams.maxSurge`.
+  `deploymentConfig.spec.strategy.rollingParams.maxSurge`.
+1. In Origin 1.3.x / OSE 3.3.x new DeploymentConfigs (latestVersion=0) with ImageChangeTriggers that use automatic=false will have their images resolved either on creation of the DeploymentConfig (assuming the image already exists in the cluster) or as soon as the image is imported. The behavior of automatic=false is restored back in Origin 1.4.x / OSE 3.4.x to not resolve images at all (as it is working in all releases prior to Origin 1.3.x / OSE 3.3.x)
diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_deploy_api_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_deploy_api_v1.proto
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -23426,7 +23426,7 @@
     "properties": {
      "automatic": {
       "type": "boolean",
-      "description": "Automatic means that the detection of a new tag value should result in an image update inside the pod template. Deployment configs that haven't been deployed yet will always have their images updated. Deployment configs that have been deployed at least once, will have their images updated only if this is set to true."
+      "description": "Automatic means that the detection of a new tag value should result in an image update inside the pod template."
      },
      "containerNames": {
       "type": "array",

diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json
@@ -46452,7 +46452,7 @@
     ],
     "properties": {
      "automatic": {
-      "description": "Automatic means that the detection of a new tag value should result in an image update inside the pod template. Deployment configs that haven't been deployed yet will always have their images updated. Deployment configs that have been deployed at least once, will have their images updated only if this is set to true.",
+      "description": "Automatic means that the detection of a new tag value should result in an image update inside the pod template.",
       "type": "boolean"
      },
      "containerNames": {

diff --git a/pkg/deploy/api/types.go b/pkg/deploy/api/types.go
@@ -374,9 +374,7 @@ const (
 // DeploymentTriggerImageChangeParams represents the parameters to the ImageChange trigger.
 type DeploymentTriggerImageChangeParams struct {
 	// Automatic means that the detection of a new tag value should result in an image update
-	// inside the pod template. Deployment configs that haven't been deployed yet will always
-	// have their images updated. Deployment configs that have been deployed at least once, will
-	// have their images updated only if this is set to true.
+	// inside the pod template.
 	Automatic bool
 	// ContainerNames is used to restrict tag updates to the specified set of container names in a pod.
 	ContainerNames []string

diff --git a/pkg/deploy/api/v1/generated.proto b/pkg/deploy/api/v1/generated.proto
diff --git a/pkg/deploy/api/v1/swagger_doc.go b/pkg/deploy/api/v1/swagger_doc.go
@@ -191,7 +191,7 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string {
 
 var map_DeploymentTriggerImageChangeParams = map[string]string{
 	"":                   "DeploymentTriggerImageChangeParams represents the parameters to the ImageChange trigger.",
-	"automatic":          "Automatic means that the detection of a new tag value should result in an image update inside the pod template. Deployment configs that haven't been deployed yet will always have their images updated. Deployment configs that have been deployed at least once, will have their images updated only if this is set to true.",
+	"automatic":          "Automatic means that the detection of a new tag value should result in an image update inside the pod template.",
 	"containerNames":     "ContainerNames is used to restrict tag updates to the specified set of container names in a pod.",
 	"from":               "From is a reference to an image stream tag to watch for changes. From.Name is the only required subfield - if From.Namespace is blank, the namespace of the current deployment trigger will be used.",
 	"lastTriggeredImage": "LastTriggeredImage is the last image to be triggered.",

diff --git a/pkg/deploy/api/v1/types.go b/pkg/deploy/api/v1/types.go
@@ -348,9 +348,7 @@ const (
 // DeploymentTriggerImageChangeParams represents the parameters to the ImageChange trigger.
 type DeploymentTriggerImageChangeParams struct {
 	// Automatic means that the detection of a new tag value should result in an image update
-	// inside the pod template. Deployment configs that haven't been deployed yet will always
-	// have their images updated. Deployment configs that have been deployed at least once, will
-	// have their images updated only if this is set to true.
+	// inside the pod template.
 	Automatic bool `json:"automatic,omitempty" protobuf:"varint,1,opt,name=automatic"`
 	// ContainerNames is used to restrict tag updates to the specified set of container names in a pod.
 	ContainerNames []string `json:"containerNames,omitempty" protobuf:"bytes,2,rep,name=containerNames"`