Skip to content

no-jira: aws: allow privateDnsName field on AWS CAPI machines for dualstack support #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tthvo wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −29
Open

no-jira: aws: allow privateDnsName field on AWS CAPI machines for dualstack support #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions admission-policies/aws/unsupported-aws-spec-fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ spec:
messageExpression: "variables.specPath + '.networkInterfaces is a forbidden field'"
- expression: "!has(variables.machineSpec.uncompressedUserData)"
messageExpression: "variables.specPath + '.uncompressedUserData is a forbidden field'"
- expression: "!has(variables.machineSpec.privateDnsName)"
messageExpression: "variables.specPath + '.privateDnsName is a forbidden field'"
- expression: "!has(variables.machineSpec.ignition) || !has(variables.machineSpec.ignition.proxy)"
messageExpression: "variables.specPath + '.ignition.proxy is a forbidden field'"
- expression: "!has(variables.machineSpec.ignition) || !has(variables.machineSpec.ignition.tls)"
Expand Down
2 changes: 0 additions & 2 deletions capi-operator-manifests/aws/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ spec:
- expression: '!has(variables.machineSpec.uncompressedUserData)'
messageExpression: variables.specPath + '.uncompressedUserData is a forbidden
field'
- expression: '!has(variables.machineSpec.privateDnsName)'
messageExpression: variables.specPath + '.privateDnsName is a forbidden field'
- expression: '!has(variables.machineSpec.ignition) || !has(variables.machineSpec.ignition.proxy)'
messageExpression: variables.specPath + '.ignition.proxy is a forbidden field'
- expression: '!has(variables.machineSpec.ignition) || !has(variables.machineSpec.ignition.tls)'
Expand Down
12 changes: 0 additions & 12 deletions pkg/controllers/machinesync/machine_sync_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2815,12 +2815,6 @@ var _ = Describe("Unsupported AWS fields validating admission policy", Ordered,
},
expectedError: "ValidatingAdmissionPolicy 'openshift-cluster-api-unsupported-aws-spec-fields' with binding 'openshift-cluster-api-unsupported-aws-spec-fields' denied request: spec.cloudInit is a forbidden field",
}),
Entry("with a forbidden field (privateDNSName)", testCase{
modifier: func(m *awsv1.AWSMachine) {
m.Spec.PrivateDNSName = &awsv1.PrivateDNSName{}
},
expectedError: "ValidatingAdmissionPolicy 'openshift-cluster-api-unsupported-aws-spec-fields' with binding 'openshift-cluster-api-unsupported-aws-spec-fields' denied request: spec.privateDnsName is a forbidden field",
}),
Entry("with a forbidden field (ignition.proxy)", testCase{
modifier: func(m *awsv1.AWSMachine) {
m.Spec.Ignition = &awsv1.Ignition{Proxy: &awsv1.IgnitionProxy{}}
Expand Down Expand Up @@ -2946,12 +2940,6 @@ var _ = Describe("Unsupported AWS fields validating admission policy", Ordered,
},
expectedError: "ValidatingAdmissionPolicy 'openshift-cluster-api-unsupported-aws-spec-fields' with binding 'openshift-cluster-api-unsupported-aws-spec-fields' denied request: spec.template.spec.cloudInit is a forbidden field",
}),
Entry("with a forbidden field (privateDNSName)", testCase{
modifier: func(mt *awsv1.AWSMachineTemplate) {
mt.Spec.Template.Spec.PrivateDNSName = &awsv1.PrivateDNSName{}
},
expectedError: "ValidatingAdmissionPolicy 'openshift-cluster-api-unsupported-aws-spec-fields' with binding 'openshift-cluster-api-unsupported-aws-spec-fields' denied request: spec.template.spec.privateDnsName is a forbidden field",
}),
Entry("with a forbidden field (ignition.proxy)", testCase{
modifier: func(mt *awsv1.AWSMachineTemplate) {
mt.Spec.Template.Spec.Ignition = &awsv1.Ignition{Proxy: &awsv1.IgnitionProxy{}}
Expand Down
5 changes: 0 additions & 5 deletions pkg/conversion/capi2mapi/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,11 +788,6 @@ func handleUnsupportedAWSMachineFields(fldPath *field.Path, spec awsv1.AWSMachin
errs = append(errs, field.Invalid(fldPath.Child("cloudInit"), spec.CloudInit, "cloudInit is not supported"))
}

if spec.PrivateDNSName != nil {
// Not required for our use case.
errs = append(errs, field.Invalid(fldPath.Child("privateDNSName"), spec.PrivateDNSName, "privateDNSName is not supported"))
}

if spec.Ignition != nil {
if spec.Ignition.Proxy != nil {
// Ignition proxy is not configurable in MAPI. Not required for our use case.
Expand Down
8 changes: 0 additions & 8 deletions pkg/conversion/capi2mapi/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,6 @@ var _ = Describe("capi2mapi AWS conversion", func() {
expectedWarnings: []string{},
}),

Entry("With unsupported PrivateDNSName", awsCAPI2MAPIMachineConversionInput{
awsClusterBuilder: awsCAPIAWSClusterBase,
awsMachineBuilder: awsCAPIAWSMachineBase.WithPrivateDNSName(&awsv1.PrivateDNSName{}),
machineBuilder: awsCAPIMachineBase,
expectedErrors: []string{"spec.privateDNSName: Invalid value: {}: privateDNSName is not supported"},
expectedWarnings: []string{},
}),

Entry("With unsupported Ignition Proxy", awsCAPI2MAPIMachineConversionInput{
awsClusterBuilder: awsCAPIAWSClusterBase,
awsMachineBuilder: awsCAPIAWSMachineBase.
Expand Down