Skip to content

Commit 6d44ef8

Browse files
aswinsuryanclaude
aswinsuryan
and
claude
committed
Fix SecurityGroups comment to reflect enforced CCM Managed mode
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent eea9ad9 commit 6d44ef8

8 files changed

Lines changed: 60 additions & 69 deletions

‎openapi/generated_openapi/zz_generated.openapi.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openapi/openapi.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30595,6 +30595,15 @@
3059530595
"TCP"
3059630596
]
3059730597
},
30598+
"securityGroups": {
30599+
"description": "securityGroups is a list of security group IDs to attach to the Network Load Balancer. When specified, these security groups replace the managed security group that the Cloud Controller Manager would otherwise create automatically. The user is responsible for configuring the ingress and egress rules on the specified security groups.\n\nThe specified security groups must exist in the same VPC as the cluster and must allow the necessary traffic for the IngressController to function.\n\nWhen this field is omitted, the Cloud Controller Manager automatically creates and manages a security group for the NLB.\n\nEach security group ID must be unique. At least 1 and at most 5 security groups can be specified.",
30600+
"type": "array",
30601+
"items": {
30602+
"type": "string",
30603+
"default": ""
30604+
},
30605+
"x-kubernetes-list-type": "atomic"
30606+
},
3059830607
"subnets": {
3059930608
"description": "subnets specifies the subnets to which the load balancer will attach. The subnets may be specified by either their ID or name. The total number of subnets is limited to 10.\n\nIn order for the load balancer to be provisioned with subnets, each subnet must exist, each subnet must be from a different availability zone, and the load balancer service must be recreated to pick up new values.\n\nWhen omitted from the spec, the subnets will be auto-discovered for each availability zone. Auto-discovered subnets are not reported in the status of the IngressController object.",
3060030609
"$ref": "#/definitions/com.github.openshift.api.operator.v1.AWSSubnets"

‎operator/v1/types_ingresscontroller.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -935,17 +935,15 @@ type AWSNetworkLoadBalancerParameters struct {
935935
// cluster and must allow the necessary traffic for the
936936
// IngressController to function.
937937
//
938-
// When this field is omitted, behavior depends on the
939-
// NLBSecurityGroupMode setting in the CCM cloud-config: if set to
940-
// Managed, the Cloud Controller Manager automatically creates and
941-
// manages a security group for the NLB; if set to Disabled or
942-
// unset, no security group is attached to the NLB.
938+
// When this field is omitted, the Cloud Controller Manager
939+
// automatically creates and manages a security group for the NLB.
943940
//
944-
// Each security group ID must be unique. A maximum of 5 security
945-
// groups can be specified.
941+
// Each security group ID must be unique. At least 1 and at most 5
942+
// security groups can be specified.
946943
//
947944
// +optional
948945
// +listType=atomic
946+
// +kubebuilder:validation:MinItems=1
949947
// +kubebuilder:validation:MaxItems=5
950948
// +kubebuilder:validation:XValidation:rule=`self.all(x, self.exists_one(y, x == y))`,message="securityGroups cannot contain duplicates"
951949
// +openshift:enable:FeatureGate=IngressControllerLBSecurityGroupsAWS

‎operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-CustomNoUpgrade.crd.yaml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,11 @@ spec:
557557
cluster and must allow the necessary traffic for the
558558
IngressController to function.
559559
560-
When this field is omitted, behavior depends on the
561-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
562-
Managed, the Cloud Controller Manager automatically creates and
563-
manages a security group for the NLB; if set to Disabled or
564-
unset, no security group is attached to the NLB.
565-
566-
Each security group ID must be unique. A maximum of 5 security
567-
groups can be specified.
560+
When this field is omitted, the Cloud Controller Manager
561+
automatically creates and manages a security group for the NLB.
562+
563+
Each security group ID must be unique. At least 1 and at most 5
564+
security groups can be specified.
568565
items:
569566
description: |-
570567
SecurityGroupID is an AWS EC2 security group ID.
@@ -578,6 +575,7 @@ spec:
578575
by 8 or 17 hexadecimal characters
579576
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
580577
maxItems: 5
578+
minItems: 1
581579
type: array
582580
x-kubernetes-list-type: atomic
583581
x-kubernetes-validations:
@@ -2994,14 +2992,11 @@ spec:
29942992
cluster and must allow the necessary traffic for the
29952993
IngressController to function.
29962994
2997-
When this field is omitted, behavior depends on the
2998-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
2999-
Managed, the Cloud Controller Manager automatically creates and
3000-
manages a security group for the NLB; if set to Disabled or
3001-
unset, no security group is attached to the NLB.
2995+
When this field is omitted, the Cloud Controller Manager
2996+
automatically creates and manages a security group for the NLB.
30022997
3003-
Each security group ID must be unique. A maximum of 5 security
3004-
groups can be specified.
2998+
Each security group ID must be unique. At least 1 and at most 5
2999+
security groups can be specified.
30053000
items:
30063001
description: |-
30073002
SecurityGroupID is an AWS EC2 security group ID.
@@ -3015,6 +3010,7 @@ spec:
30153010
by 8 or 17 hexadecimal characters
30163011
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
30173012
maxItems: 5
3013+
minItems: 1
30183014
type: array
30193015
x-kubernetes-list-type: atomic
30203016
x-kubernetes-validations:

‎operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-DevPreviewNoUpgrade.crd.yaml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,11 @@ spec:
557557
cluster and must allow the necessary traffic for the
558558
IngressController to function.
559559
560-
When this field is omitted, behavior depends on the
561-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
562-
Managed, the Cloud Controller Manager automatically creates and
563-
manages a security group for the NLB; if set to Disabled or
564-
unset, no security group is attached to the NLB.
565-
566-
Each security group ID must be unique. A maximum of 5 security
567-
groups can be specified.
560+
When this field is omitted, the Cloud Controller Manager
561+
automatically creates and manages a security group for the NLB.
562+
563+
Each security group ID must be unique. At least 1 and at most 5
564+
security groups can be specified.
568565
items:
569566
description: |-
570567
SecurityGroupID is an AWS EC2 security group ID.
@@ -578,6 +575,7 @@ spec:
578575
by 8 or 17 hexadecimal characters
579576
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
580577
maxItems: 5
578+
minItems: 1
581579
type: array
582580
x-kubernetes-list-type: atomic
583581
x-kubernetes-validations:
@@ -2994,14 +2992,11 @@ spec:
29942992
cluster and must allow the necessary traffic for the
29952993
IngressController to function.
29962994
2997-
When this field is omitted, behavior depends on the
2998-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
2999-
Managed, the Cloud Controller Manager automatically creates and
3000-
manages a security group for the NLB; if set to Disabled or
3001-
unset, no security group is attached to the NLB.
2995+
When this field is omitted, the Cloud Controller Manager
2996+
automatically creates and manages a security group for the NLB.
30022997
3003-
Each security group ID must be unique. A maximum of 5 security
3004-
groups can be specified.
2998+
Each security group ID must be unique. At least 1 and at most 5
2999+
security groups can be specified.
30053000
items:
30063001
description: |-
30073002
SecurityGroupID is an AWS EC2 security group ID.
@@ -3015,6 +3010,7 @@ spec:
30153010
by 8 or 17 hexadecimal characters
30163011
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
30173012
maxItems: 5
3013+
minItems: 1
30183014
type: array
30193015
x-kubernetes-list-type: atomic
30203016
x-kubernetes-validations:

‎operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-TechPreviewNoUpgrade.crd.yaml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,11 @@ spec:
557557
cluster and must allow the necessary traffic for the
558558
IngressController to function.
559559
560-
When this field is omitted, behavior depends on the
561-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
562-
Managed, the Cloud Controller Manager automatically creates and
563-
manages a security group for the NLB; if set to Disabled or
564-
unset, no security group is attached to the NLB.
565-
566-
Each security group ID must be unique. A maximum of 5 security
567-
groups can be specified.
560+
When this field is omitted, the Cloud Controller Manager
561+
automatically creates and manages a security group for the NLB.
562+
563+
Each security group ID must be unique. At least 1 and at most 5
564+
security groups can be specified.
568565
items:
569566
description: |-
570567
SecurityGroupID is an AWS EC2 security group ID.
@@ -578,6 +575,7 @@ spec:
578575
by 8 or 17 hexadecimal characters
579576
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
580577
maxItems: 5
578+
minItems: 1
581579
type: array
582580
x-kubernetes-list-type: atomic
583581
x-kubernetes-validations:
@@ -2994,14 +2992,11 @@ spec:
29942992
cluster and must allow the necessary traffic for the
29952993
IngressController to function.
29962994
2997-
When this field is omitted, behavior depends on the
2998-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
2999-
Managed, the Cloud Controller Manager automatically creates and
3000-
manages a security group for the NLB; if set to Disabled or
3001-
unset, no security group is attached to the NLB.
2995+
When this field is omitted, the Cloud Controller Manager
2996+
automatically creates and manages a security group for the NLB.
30022997
3003-
Each security group ID must be unique. A maximum of 5 security
3004-
groups can be specified.
2998+
Each security group ID must be unique. At least 1 and at most 5
2999+
security groups can be specified.
30053000
items:
30063001
description: |-
30073002
SecurityGroupID is an AWS EC2 security group ID.
@@ -3015,6 +3010,7 @@ spec:
30153010
by 8 or 17 hexadecimal characters
30163011
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
30173012
maxItems: 5
3013+
minItems: 1
30183014
type: array
30193015
x-kubernetes-list-type: atomic
30203016
x-kubernetes-validations:

‎operator/v1/zz_generated.featuregated-crd-manifests/ingresscontrollers.operator.openshift.io/IngressControllerLBSecurityGroupsAWS.yaml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,11 @@ spec:
557557
cluster and must allow the necessary traffic for the
558558
IngressController to function.
559559
560-
When this field is omitted, behavior depends on the
561-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
562-
Managed, the Cloud Controller Manager automatically creates and
563-
manages a security group for the NLB; if set to Disabled or
564-
unset, no security group is attached to the NLB.
565-
566-
Each security group ID must be unique. A maximum of 5 security
567-
groups can be specified.
560+
When this field is omitted, the Cloud Controller Manager
561+
automatically creates and manages a security group for the NLB.
562+
563+
Each security group ID must be unique. At least 1 and at most 5
564+
security groups can be specified.
568565
items:
569566
description: |-
570567
SecurityGroupID is an AWS EC2 security group ID.
@@ -578,6 +575,7 @@ spec:
578575
by 8 or 17 hexadecimal characters
579576
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
580577
maxItems: 5
578+
minItems: 1
581579
type: array
582580
x-kubernetes-list-type: atomic
583581
x-kubernetes-validations:
@@ -2876,14 +2874,11 @@ spec:
28762874
cluster and must allow the necessary traffic for the
28772875
IngressController to function.
28782876
2879-
When this field is omitted, behavior depends on the
2880-
NLBSecurityGroupMode setting in the CCM cloud-config: if set to
2881-
Managed, the Cloud Controller Manager automatically creates and
2882-
manages a security group for the NLB; if set to Disabled or
2883-
unset, no security group is attached to the NLB.
2877+
When this field is omitted, the Cloud Controller Manager
2878+
automatically creates and manages a security group for the NLB.
28842879
2885-
Each security group ID must be unique. A maximum of 5 security
2886-
groups can be specified.
2880+
Each security group ID must be unique. At least 1 and at most 5
2881+
security groups can be specified.
28872882
items:
28882883
description: |-
28892884
SecurityGroupID is an AWS EC2 security group ID.
@@ -2897,6 +2892,7 @@ spec:
28972892
by 8 or 17 hexadecimal characters
28982893
rule: self.startsWith('sg-') && self.substring(3).matches('^[0-9a-fA-F]{8}$|^[0-9a-fA-F]{17}$')
28992894
maxItems: 5
2895+
minItems: 1
29002896
type: array
29012897
x-kubernetes-list-type: atomic
29022898
x-kubernetes-validations:

0 commit comments

Comments
 (0)