Skip to content

Commit c5ac211

Browse files
Upgrade DCL to 1.79.0 (#13684) (#22403)
[upstream:4cf8621de2f875eb1f4fd30c3a1eee82114926a0] Signed-off-by: Modular Magician <[email protected]>
1 parent 28cf94b commit c5ac211

File tree

6 files changed

+278
-3
lines changed

6 files changed

+278
-3
lines changed

.changelog/13684.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
gkehub: added `configmanagement.config_sync.deployment_overrides` field to `google_gke_hub_feature_membership` resource
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
cloud.google.com/go/bigtable v1.33.0
7-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.78.0
7+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.79.0
88
github.com/apparentlymart/go-cidr v1.1.0
99
github.com/davecgh/go-spew v1.1.1
1010
github.com/dnaeon/go-vcr v1.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+
2626
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
2727
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
2828
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
29-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.78.0 h1:Mg4zefS6cVY5JEqrsjaWAcS2uUkkB7ttr5zJ3wERUek=
30-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.78.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
3129
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
3230
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
3331
github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
@@ -490,3 +488,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
490488
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
491489
rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
492490
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
491+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.79.0 h1:vaebDVboAZ2tbAoMKRsprO3zAdZnQegYFhkgAwjJC8g=
492+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.79.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=

google/services/gkehub/resource_gke_hub_feature_membership.go

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ func GkeHubFeatureMembershipConfigmanagementBinauthzSchema() *schema.Resource {
186186
func GkeHubFeatureMembershipConfigmanagementConfigSyncSchema() *schema.Resource {
187187
return &schema.Resource{
188188
Schema: map[string]*schema.Schema{
189+
"deployment_overrides": {
190+
Type: schema.TypeList,
191+
Optional: true,
192+
Description: "The override configurations for the Config Sync Deployments.",
193+
Elem: GkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesSchema(),
194+
},
195+
189196
"enabled": {
190197
Type: schema.TypeBool,
191198
Optional: true,
@@ -237,6 +244,67 @@ func GkeHubFeatureMembershipConfigmanagementConfigSyncSchema() *schema.Resource
237244
}
238245
}
239246

247+
func GkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesSchema() *schema.Resource {
248+
return &schema.Resource{
249+
Schema: map[string]*schema.Schema{
250+
"containers": {
251+
Type: schema.TypeList,
252+
Optional: true,
253+
Description: "The override configurations for the containers in the Deployment.",
254+
Elem: GkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersSchema(),
255+
},
256+
257+
"deployment_name": {
258+
Type: schema.TypeString,
259+
Optional: true,
260+
Description: "The name of the Deployment.",
261+
},
262+
263+
"deployment_namespace": {
264+
Type: schema.TypeString,
265+
Optional: true,
266+
Description: "The namespace of the Deployment.",
267+
},
268+
},
269+
}
270+
}
271+
272+
func GkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersSchema() *schema.Resource {
273+
return &schema.Resource{
274+
Schema: map[string]*schema.Schema{
275+
"container_name": {
276+
Type: schema.TypeString,
277+
Optional: true,
278+
Description: "The name of the container.",
279+
},
280+
281+
"cpu_limit": {
282+
Type: schema.TypeString,
283+
Optional: true,
284+
Description: "The CPU limit of the container.",
285+
},
286+
287+
"cpu_request": {
288+
Type: schema.TypeString,
289+
Optional: true,
290+
Description: "The CPU request of the container.",
291+
},
292+
293+
"memory_limit": {
294+
Type: schema.TypeString,
295+
Optional: true,
296+
Description: "The memory limit of the container.",
297+
},
298+
299+
"memory_request": {
300+
Type: schema.TypeString,
301+
Optional: true,
302+
Description: "The memory request of the container.",
303+
},
304+
},
305+
}
306+
}
307+
240308
func GkeHubFeatureMembershipConfigmanagementConfigSyncGitSchema() *schema.Resource {
241309
return &schema.Resource{
242310
Schema: map[string]*schema.Schema{
@@ -1063,6 +1131,7 @@ func expandGkeHubFeatureMembershipConfigmanagementConfigSync(o interface{}) *gke
10631131
}
10641132
obj := objArr[0].(map[string]interface{})
10651133
return &gkehub.FeatureMembershipConfigmanagementConfigSync{
1134+
DeploymentOverrides: expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesArray(obj["deployment_overrides"]),
10661135
Enabled: dcl.Bool(obj["enabled"].(bool)),
10671136
Git: expandGkeHubFeatureMembershipConfigmanagementConfigSyncGit(obj["git"]),
10681137
MetricsGcpServiceAccountEmail: dcl.String(obj["metrics_gcp_service_account_email"].(string)),
@@ -1078,6 +1147,7 @@ func flattenGkeHubFeatureMembershipConfigmanagementConfigSync(obj *gkehub.Featur
10781147
return nil
10791148
}
10801149
transformed := map[string]interface{}{
1150+
"deployment_overrides": flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesArray(obj.DeploymentOverrides),
10811151
"enabled": obj.Enabled,
10821152
"git": flattenGkeHubFeatureMembershipConfigmanagementConfigSyncGit(obj.Git),
10831153
"metrics_gcp_service_account_email": obj.MetricsGcpServiceAccountEmail,
@@ -1089,6 +1159,128 @@ func flattenGkeHubFeatureMembershipConfigmanagementConfigSync(obj *gkehub.Featur
10891159

10901160
return []interface{}{transformed}
10911161

1162+
}
1163+
func expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesArray(o interface{}) []gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides {
1164+
if o == nil {
1165+
return make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides, 0)
1166+
}
1167+
1168+
objs := o.([]interface{})
1169+
if len(objs) == 0 || objs[0] == nil {
1170+
return make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides, 0)
1171+
}
1172+
1173+
items := make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides, 0, len(objs))
1174+
for _, item := range objs {
1175+
i := expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverrides(item)
1176+
items = append(items, *i)
1177+
}
1178+
1179+
return items
1180+
}
1181+
1182+
func expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverrides(o interface{}) *gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides {
1183+
if o == nil {
1184+
return gkehub.EmptyFeatureMembershipConfigmanagementConfigSyncDeploymentOverrides
1185+
}
1186+
1187+
obj := o.(map[string]interface{})
1188+
return &gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides{
1189+
Containers: expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersArray(obj["containers"]),
1190+
DeploymentName: dcl.String(obj["deployment_name"].(string)),
1191+
DeploymentNamespace: dcl.String(obj["deployment_namespace"].(string)),
1192+
}
1193+
}
1194+
1195+
func flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesArray(objs []gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides) []interface{} {
1196+
if objs == nil {
1197+
return nil
1198+
}
1199+
1200+
items := []interface{}{}
1201+
for _, item := range objs {
1202+
i := flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverrides(&item)
1203+
items = append(items, i)
1204+
}
1205+
1206+
return items
1207+
}
1208+
1209+
func flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverrides(obj *gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverrides) interface{} {
1210+
if obj == nil || obj.Empty() {
1211+
return nil
1212+
}
1213+
transformed := map[string]interface{}{
1214+
"containers": flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersArray(obj.Containers),
1215+
"deployment_name": obj.DeploymentName,
1216+
"deployment_namespace": obj.DeploymentNamespace,
1217+
}
1218+
1219+
return transformed
1220+
1221+
}
1222+
func expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersArray(o interface{}) []gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers {
1223+
if o == nil {
1224+
return make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers, 0)
1225+
}
1226+
1227+
objs := o.([]interface{})
1228+
if len(objs) == 0 || objs[0] == nil {
1229+
return make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers, 0)
1230+
}
1231+
1232+
items := make([]gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers, 0, len(objs))
1233+
for _, item := range objs {
1234+
i := expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers(item)
1235+
items = append(items, *i)
1236+
}
1237+
1238+
return items
1239+
}
1240+
1241+
func expandGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers(o interface{}) *gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers {
1242+
if o == nil {
1243+
return gkehub.EmptyFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers
1244+
}
1245+
1246+
obj := o.(map[string]interface{})
1247+
return &gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers{
1248+
ContainerName: dcl.String(obj["container_name"].(string)),
1249+
CpuLimit: dcl.String(obj["cpu_limit"].(string)),
1250+
CpuRequest: dcl.String(obj["cpu_request"].(string)),
1251+
MemoryLimit: dcl.String(obj["memory_limit"].(string)),
1252+
MemoryRequest: dcl.String(obj["memory_request"].(string)),
1253+
}
1254+
}
1255+
1256+
func flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainersArray(objs []gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers) []interface{} {
1257+
if objs == nil {
1258+
return nil
1259+
}
1260+
1261+
items := []interface{}{}
1262+
for _, item := range objs {
1263+
i := flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers(&item)
1264+
items = append(items, i)
1265+
}
1266+
1267+
return items
1268+
}
1269+
1270+
func flattenGkeHubFeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers(obj *gkehub.FeatureMembershipConfigmanagementConfigSyncDeploymentOverridesContainers) interface{} {
1271+
if obj == nil || obj.Empty() {
1272+
return nil
1273+
}
1274+
transformed := map[string]interface{}{
1275+
"container_name": obj.ContainerName,
1276+
"cpu_limit": obj.CpuLimit,
1277+
"cpu_request": obj.CpuRequest,
1278+
"memory_limit": obj.MemoryLimit,
1279+
"memory_request": obj.MemoryRequest,
1280+
}
1281+
1282+
return transformed
1283+
10921284
}
10931285

10941286
func expandGkeHubFeatureMembershipConfigmanagementConfigSyncGit(o interface{}) *gkehub.FeatureMembershipConfigmanagementConfigSyncGit {

google/services/gkehub/resource_gke_hub_feature_membership_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,17 @@ resource "google_gke_hub_feature_membership" "feature_member_1" {
119119
sync_repo = "https://github.com/GoogleCloudPlatform/magic-modules"
120120
secret_type = "none"
121121
}
122+
deployment_overrides {
123+
deployment_name = "reconciler-manager"
124+
deployment_namespace = "config-management-system"
125+
containers {
126+
container_name = "reconciler-manager"
127+
cpu_request = "1"
128+
memory_request = "4Gi"
129+
cpu_limit = "2"
130+
memory_limit = "8Gi"
131+
}
132+
}
122133
}
123134
}
124135
}
@@ -170,6 +181,35 @@ resource "google_gke_hub_feature_membership" "feature_member_1" {
170181
sync_repo = "https://github.com/GoogleCloudPlatform/magic-modules"
171182
secret_type = "none"
172183
}
184+
deployment_overrides {
185+
deployment_name = "reconciler-manager"
186+
deployment_namespace = "config-management-system"
187+
containers {
188+
container_name = "reconciler-manager"
189+
cpu_request = "2"
190+
memory_request = "5Gi"
191+
cpu_limit = "3"
192+
memory_limit = "9Gi"
193+
}
194+
}
195+
deployment_overrides {
196+
deployment_name = "resource-group-controller-manager"
197+
deployment_namespace = "resource-group-system"
198+
containers {
199+
container_name = "manager"
200+
cpu_request = "1"
201+
memory_request = "4Gi"
202+
cpu_limit = "2"
203+
memory_limit = "8Gi"
204+
}
205+
containers {
206+
container_name = "otel-agent"
207+
cpu_request = "1"
208+
memory_request = "4Gi"
209+
cpu_limit = "2"
210+
memory_limit = "8Gi"
211+
}
212+
}
173213
}
174214
management = "MANAGEMENT_AUTOMATIC"
175215
}

website/docs/r/gke_hub_feature_membership.html.markdown

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,10 @@ The following arguments are supported:
427427
* `stop_syncing` -
428428
(Optional)
429429
Set to `true` to stop syncing configurations for a single cluster. This field is only available on clusters using Config Sync [auto-upgrades](http://cloud/kubernetes-engine/enterprise/config-sync/docs/how-to/upgrade-config-sync#auto-upgrade-config) or on Config Sync version 1.20.0 or later. Defaults: `false`.
430+
431+
* `deployment_overrides` -
432+
(Optional)
433+
The override configurations for the Config Sync Deployments. Structure is [documented below](#nested_deployment_overrides).
430434

431435
<a name="nested_git"></a>The `git` block supports:
432436

@@ -462,6 +466,42 @@ The following arguments are supported:
462466
(Optional)
463467
Period in seconds between consecutive syncs. Default: 15.
464468

469+
<a name="nested_deployment_overrides"></a>The `deployment_overrides` block supports:
470+
471+
* `deployment_name` -
472+
(Optional)
473+
The name of the Deployment.
474+
475+
* `deployment_namespace` -
476+
(Optional)
477+
The namespace of the Deployment.
478+
479+
* `containers` -
480+
(Optional)
481+
The override configurations for the containers in the Deployment. Structure is [documented below](#nested_deployment_overrides_containers).
482+
483+
<a name="nested_deployment_overrides_containers"></a>The `containers` block supports:
484+
485+
* `container_name` -
486+
(Optional)
487+
The name of the container.
488+
489+
* `cpu_request` -
490+
(Optional)
491+
The CPU request of the container.
492+
493+
* `memory_request` -
494+
(Optional)
495+
The memory request of the container.
496+
497+
* `cpu_limit` -
498+
(Optional)
499+
The CPU limit of the container.
500+
501+
* `memory_limit` -
502+
(Optional)
503+
The memory limit of the container.
504+
465505
<a name="nested_oci"></a>The `oci` block supports:
466506

467507
* `gcp_service_account_email` -

0 commit comments

Comments
 (0)