Skip to content

Commit

Permalink
Upgrade DCL to 1.71.0 (#11402) (#19100)
Browse files Browse the repository at this point in the history
[upstream:8bed26c9a024ada0fcdb1ddea3bb01df32028c1c]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Aug 12, 2024
1 parent db3ff07 commit 18cceb6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .changelog/11402.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
clouddeploy: added `serial_pipeline.stages.strategy.canary.runtime_config.kubernetes.gateway_service_mesh.pod_selector_label` and `serial_pipeline.stages.strategy.canary.runtime_config.kubernetes.service_networking.pod_selector_label` fields to `google_clouddeploy_delivery_pipeline` resource
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
cloud.google.com/go/bigtable v1.29.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.70.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.71.0
github.com/apparentlymart/go-cidr v1.1.0
github.com/davecgh/go-spew v1.1.1
github.com/dnaeon/go-vcr v1.0.1
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ cloud.google.com/go/monitoring v1.20.3/go.mod h1:GPIVIdNznIdGqEjtRKQWTLcUeRnPjZW
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0 h1:LIPIYi4hy7ttUSrziY/TYwMDuEvvV593n80kRmz6nZ4=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.68.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.70.0 h1:dqqxHZYK0tlzViFqAbKzMIkfboQVWYN1CTEM2sjBtmQ=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.70.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.71.0 h1:vRKCLiR3faPmXAoqSdwXLv28/kygggzaKXzgdm6GXhg=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.71.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,12 @@ func ClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntimeConfigK
Description: "Required. Name of the Kubernetes Service.",
},

"pod_selector_label": {
Type: schema.TypeString,
Optional: true,
Description: "Optional. The label to use when selecting Pods for the Deployment and Service resources. This label must already be present in both resources.",
},

"route_update_wait_time": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -566,6 +572,12 @@ func ClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntimeConfigK
Optional: true,
Description: "Optional. Whether to disable Pod overprovisioning. If Pod overprovisioning is disabled then Cloud Deploy will limit the number of total Pods used for the deployment strategy to the number of Pods the Deployment has on the cluster.",
},

"pod_selector_label": {
Type: schema.TypeString,
Optional: true,
Description: "Optional. The label to use when selecting Pods for the Deployment resource. This label must already be present in the Deployment.",
},
},
}
}
Expand Down Expand Up @@ -1502,6 +1514,7 @@ func expandClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntimeC
Deployment: dcl.String(obj["deployment"].(string)),
HttpRoute: dcl.String(obj["http_route"].(string)),
Service: dcl.String(obj["service"].(string)),
PodSelectorLabel: dcl.String(obj["pod_selector_label"].(string)),
RouteUpdateWaitTime: dcl.String(obj["route_update_wait_time"].(string)),
StableCutbackDuration: dcl.String(obj["stable_cutback_duration"].(string)),
}
Expand All @@ -1515,6 +1528,7 @@ func flattenClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntime
"deployment": obj.Deployment,
"http_route": obj.HttpRoute,
"service": obj.Service,
"pod_selector_label": obj.PodSelectorLabel,
"route_update_wait_time": obj.RouteUpdateWaitTime,
"stable_cutback_duration": obj.StableCutbackDuration,
}
Expand All @@ -1536,6 +1550,7 @@ func expandClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntimeC
Deployment: dcl.String(obj["deployment"].(string)),
Service: dcl.String(obj["service"].(string)),
DisablePodOverprovisioning: dcl.Bool(obj["disable_pod_overprovisioning"].(bool)),
PodSelectorLabel: dcl.String(obj["pod_selector_label"].(string)),
}
}

Expand All @@ -1547,6 +1562,7 @@ func flattenClouddeployDeliveryPipelineSerialPipelineStagesStrategyCanaryRuntime
"deployment": obj.Deployment,
"service": obj.Service,
"disable_pod_overprovisioning": obj.DisablePodOverprovisioning,
"pod_selector_label": obj.PodSelectorLabel,
}

return []interface{}{transformed}
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/clouddeploy_delivery_pipeline.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,10 @@ The `gateway_service_mesh` block supports:
(Required)
Required. Name of the Gateway API HTTPRoute.

* `pod_selector_label` -
(Optional)
Optional. The label to use when selecting Pods for the Deployment and Service resources. This label must already be present in both resources.

* `route_update_wait_time` -
(Optional)
Optional. The time to wait for route updates to propagate. The maximum configurable time is 3 hours, in seconds format. If unspecified, there is no wait time.
Expand All @@ -493,6 +497,10 @@ The `service_networking` block supports:
(Optional)
Optional. Whether to disable Pod overprovisioning. If Pod overprovisioning is disabled then Cloud Deploy will limit the number of total Pods used for the deployment strategy to the number of Pods the Deployment has on the cluster.

* `pod_selector_label` -
(Optional)
Optional. The label to use when selecting Pods for the Deployment resource. This label must already be present in the Deployment.

* `service` -
(Required)
Required. Name of the Kubernetes Service.
Expand Down

0 comments on commit 18cceb6

Please sign in to comment.