Skip to content

Commit

Permalink
Automated DCL import.
Browse files Browse the repository at this point in the history 
  - b01174a8be3b0b62cde1c5f9d2b7ee8e377edac4 Automatic import from cloud_mmv2_dcl_20220510_1531_RC00 by DCL Team <[email protected]>

GitOrigin-RevId: b01174a8be3b0b62cde1c5f9d2b7ee8e377edac4
  • Loading branch information
@copybara-github
DCL Team authored and copybara-github committed May 10, 2022
1 parent cb224b3 commit 23a3d78
Show file tree
Hide file tree
Showing 21 changed files with 33 additions and 45 deletions.
2 changes: 0 additions & 2 deletions services/google/containeraws/alpha/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ components:
x-dcl-go-type: ClusterControlPlaneSshConfig
description: Optional. SSH configuration for how to access the underlying
control plane machines.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -360,7 +359,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
subnetIds:
type: array
x-dcl-go-name: SubnetIds
Expand Down
6 changes: 3 additions & 3 deletions services/google/containeraws/alpha/cluster_alpha_yaml_embed.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions services/google/containeraws/alpha/cluster_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ func compareClusterControlPlaneNewStyle(d, a interface{}, fn dcl.FieldName) ([]*
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -3124,7 +3124,7 @@ func compareClusterControlPlaneSshConfigNewStyle(d, a interface{}, fn dcl.FieldN
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions services/google/containeraws/alpha/node_pool.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ components:
x-dcl-go-name: SshConfig
x-dcl-go-type: NodePoolConfigSshConfig
description: Optional. The SSH configuration.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -289,7 +288,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
tags:
type: object
additionalProperties:
Expand Down
6 changes: 3 additions & 3 deletions services/google/containeraws/alpha/node_pool_alpha_yaml_embed.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions services/google/containeraws/alpha/node_pool_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,7 @@ func compareNodePoolConfigNewStyle(d, a interface{}, fn dcl.FieldName) ([]*dcl.F
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2235,7 +2235,7 @@ func compareNodePoolConfigSshConfigNewStyle(d, a interface{}, fn dcl.FieldName)
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions services/google/containeraws/beta/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ components:
x-dcl-go-type: ClusterControlPlaneSshConfig
description: Optional. SSH configuration for how to access the underlying
control plane machines.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -360,7 +359,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
subnetIds:
type: array
x-dcl-go-name: SubnetIds
Expand Down
6 changes: 3 additions & 3 deletions services/google/containeraws/beta/cluster_beta_yaml_embed.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions services/google/containeraws/beta/cluster_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ func compareClusterControlPlaneNewStyle(d, a interface{}, fn dcl.FieldName) ([]*
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -3124,7 +3124,7 @@ func compareClusterControlPlaneSshConfigNewStyle(d, a interface{}, fn dcl.FieldN
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions services/google/containeraws/beta/node_pool.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ components:
x-dcl-go-name: SshConfig
x-dcl-go-type: NodePoolConfigSshConfig
description: Optional. The SSH configuration.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -289,7 +288,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
tags:
type: object
additionalProperties:
Expand Down
6 changes: 3 additions & 3 deletions services/google/containeraws/beta/node_pool_beta_yaml_embed.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions services/google/containeraws/beta/node_pool_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,7 @@ func compareNodePoolConfigNewStyle(d, a interface{}, fn dcl.FieldName) ([]*dcl.F
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2235,7 +2235,7 @@ func compareNodePoolConfigSshConfigNewStyle(d, a interface{}, fn dcl.FieldName)
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions services/google/containeraws/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ components:
x-dcl-go-type: ClusterControlPlaneSshConfig
description: Optional. SSH configuration for how to access the underlying
control plane machines.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -339,7 +338,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
subnetIds:
type: array
x-dcl-go-name: SubnetIds
Expand Down
4 changes: 2 additions & 2 deletions services/google/containeraws/cluster_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2644,7 +2644,7 @@ func compareClusterControlPlaneNewStyle(d, a interface{}, fn dcl.FieldName) ([]*
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareClusterControlPlaneSshConfigNewStyle, EmptyObject: EmptyClusterControlPlaneSshConfig, OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2743,7 +2743,7 @@ func compareClusterControlPlaneSshConfigNewStyle(d, a interface{}, fn dcl.FieldN
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateClusterUpdateAwsClusterOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions services/google/containeraws/cluster_yaml_embed.go
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions services/google/containeraws/node_pool.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ components:
x-dcl-go-name: SshConfig
x-dcl-go-type: NodePoolConfigSshConfig
description: Optional. The SSH configuration.
x-kubernetes-immutable: true
required:
- ec2KeyPair
properties:
Expand All @@ -262,7 +261,6 @@ components:
x-dcl-go-name: Ec2KeyPair
description: The name of the EC2 key pair used to login into cluster
machines.
x-kubernetes-immutable: true
tags:
type: object
additionalProperties:
Expand Down
4 changes: 2 additions & 2 deletions services/google/containeraws/node_pool_internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1926,7 +1926,7 @@ func compareNodePoolConfigNewStyle(d, a interface{}, fn dcl.FieldName) ([]*dcl.F
diffs = append(diffs, ds...)
}

if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.SshConfig, actual.SshConfig, dcl.Info{ObjectFunction: compareNodePoolConfigSshConfigNewStyle, EmptyObject: EmptyNodePoolConfigSshConfig, OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("SshConfig")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2091,7 +2091,7 @@ func compareNodePoolConfigSshConfigNewStyle(d, a interface{}, fn dcl.FieldName)
actual = &actualNotPointer
}

if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.RequiresRecreate()}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if ds, err := dcl.Diff(desired.Ec2KeyPair, actual.Ec2KeyPair, dcl.Info{OperationSelector: dcl.TriggersOperation("updateNodePoolUpdateAwsNodePoolOperation")}, fn.AddNest("Ec2KeyPair")); len(ds) != 0 || err != nil {
if err != nil {
return nil, err
}
Expand Down
Loading

0 comments on commit 23a3d78

Please sign in to comment.