diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 1aa93d78..4ba2c027 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2022-02-15T19:48:11Z" - build_hash: 930850fc31c40fa7d44f2544ce6e676baab05c27 - go_version: go1.17.5 + build_date: "2022-02-17T19:24:44Z" + build_hash: f8c0f4711a91e50335450521e3c49673d135d56d + go_version: go1.17 version: v0.17.0 -api_directory_checksum: 53bf89b25ebd446d32de63e43f43078c33eaf467 +api_directory_checksum: ad688fd5a2b395bf5f01413c99ac635e7670ba75 api_version: v1alpha1 aws_sdk_go_version: v1.42.0 generator_config_info: - file_checksum: e93e719d54870efb075bdae82876e2f102821573 + file_checksum: cdc6db8f7b924d8b14a4926f0bb937b7952b102f original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/dhcp_options.go b/apis/v1alpha1/dhcp_options.go new file mode 100644 index 00000000..6bce075c --- /dev/null +++ b/apis/v1alpha1/dhcp_options.go @@ -0,0 +1,78 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package v1alpha1 + +import ( + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// DhcpOptionsSpec defines the desired state of DhcpOptions. +// +// Describes a set of DHCP options. +type DHCPOptionsSpec struct { + // A DHCP configuration option. + // +kubebuilder:validation:Required + DHCPConfigurations []*NewDHCPConfiguration `json:"dhcpConfigurations"` + // The tags to assign to the DHCP option. + TagSpecifications []*TagSpecification `json:"tagSpecifications,omitempty"` +} + +// DHCPOptionsStatus defines the observed state of DHCPOptions +type DHCPOptionsStatus struct { + // All CRs managed by ACK have a common `Status.ACKResourceMetadata` member + // that is used to contain resource sync state, account ownership, + // constructed ARN for the resource + // +kubebuilder:validation:Optional + ACKResourceMetadata *ackv1alpha1.ResourceMetadata `json:"ackResourceMetadata"` + // All CRS managed by ACK have a common `Status.Conditions` member that + // contains a collection of `ackv1alpha1.Condition` objects that describe + // the various terminal states of the CR and its backend AWS service API + // resource + // +kubebuilder:validation:Optional + Conditions []*ackv1alpha1.Condition `json:"conditions"` + // The ID of the set of DHCP options. + // +kubebuilder:validation:Optional + DHCPOptionsID *string `json:"dhcpOptionsID,omitempty"` + // The ID of the Amazon Web Services account that owns the DHCP options set. + // +kubebuilder:validation:Optional + OwnerID *string `json:"ownerID,omitempty"` + // Any tags assigned to the DHCP options set. + // +kubebuilder:validation:Optional + Tags []*Tag `json:"tags,omitempty"` +} + +// DHCPOptions is the Schema for the DHCPOptions API +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +type DHCPOptions struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec DHCPOptionsSpec `json:"spec,omitempty"` + Status DHCPOptionsStatus `json:"status,omitempty"` +} + +// DHCPOptionsList contains a list of DHCPOptions +// +kubebuilder:object:root=true +type DHCPOptionsList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []DHCPOptions `json:"items"` +} + +func init() { + SchemeBuilder.Register(&DHCPOptions{}, &DHCPOptionsList{}) +} diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index 5bedf271..1d63c272 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -3,6 +3,7 @@ ignore: - ModifyTransitGateway - ModifyVpcEndpoint field_paths: + - CreateDhcpOptionsInput.DryRun - CreateInternetGatewayInput.DryRun - CreateRouteInput.DryRun - CreateRouteInput.RouteTableId @@ -26,6 +27,7 @@ ignore: - CustomerGateway - DefaultSubnet - DefaultVpc + #- DhcpOptions - EgressOnlyInternetGateway - Fleet - FpgaImage @@ -91,6 +93,11 @@ operations: resource_name: VpcEndpoint resources: + DhcpOptions: + fields: + DHCPConfigurations.Values: + set: + - from: AttributeValue.Value RouteTable: exceptions: terminal_codes: diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index 3ef66cce..70cba16b 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -607,14 +607,16 @@ type CustomerGateway struct { // Describes a DHCP configuration option. type DHCPConfiguration struct { - Key *string `json:"key,omitempty"` + Key *string `json:"key,omitempty"` + Values []*AttributeValue `json:"values,omitempty"` } // Describes a set of DHCP options. -type DHCPOptions struct { - DHCPOptionsID *string `json:"dhcpOptionsID,omitempty"` - OwnerID *string `json:"ownerID,omitempty"` - Tags []*Tag `json:"tags,omitempty"` +type DHCPOptions_SDK struct { + DHCPConfigurations []*DHCPConfiguration `json:"dhcpConfigurations,omitempty"` + DHCPOptionsID *string `json:"dhcpOptionsID,omitempty"` + OwnerID *string `json:"ownerID,omitempty"` + Tags []*Tag `json:"tags,omitempty"` } // Describes a DNS entry. diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index e23f2b14..ff510814 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -2495,6 +2495,17 @@ func (in *DHCPConfiguration) DeepCopyInto(out *DHCPConfiguration) { *out = new(string) **out = **in } + if in.Values != nil { + in, out := &in.Values, &out.Values + *out = make([]*AttributeValue, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(AttributeValue) + (*in).DeepCopyInto(*out) + } + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPConfiguration. @@ -2510,6 +2521,118 @@ func (in *DHCPConfiguration) DeepCopy() *DHCPConfiguration { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DHCPOptions) DeepCopyInto(out *DHCPOptions) { *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptions. +func (in *DHCPOptions) DeepCopy() *DHCPOptions { + if in == nil { + return nil + } + out := new(DHCPOptions) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DHCPOptions) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DHCPOptionsList) DeepCopyInto(out *DHCPOptionsList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DHCPOptions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptionsList. +func (in *DHCPOptionsList) DeepCopy() *DHCPOptionsList { + if in == nil { + return nil + } + out := new(DHCPOptionsList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *DHCPOptionsList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DHCPOptionsSpec) DeepCopyInto(out *DHCPOptionsSpec) { + *out = *in + if in.DHCPConfigurations != nil { + in, out := &in.DHCPConfigurations, &out.DHCPConfigurations + *out = make([]*NewDHCPConfiguration, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(NewDHCPConfiguration) + (*in).DeepCopyInto(*out) + } + } + } + if in.TagSpecifications != nil { + in, out := &in.TagSpecifications, &out.TagSpecifications + *out = make([]*TagSpecification, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(TagSpecification) + (*in).DeepCopyInto(*out) + } + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptionsSpec. +func (in *DHCPOptionsSpec) DeepCopy() *DHCPOptionsSpec { + if in == nil { + return nil + } + out := new(DHCPOptionsSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DHCPOptionsStatus) DeepCopyInto(out *DHCPOptionsStatus) { + *out = *in + if in.ACKResourceMetadata != nil { + in, out := &in.ACKResourceMetadata, &out.ACKResourceMetadata + *out = new(corev1alpha1.ResourceMetadata) + (*in).DeepCopyInto(*out) + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]*corev1alpha1.Condition, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(corev1alpha1.Condition) + (*in).DeepCopyInto(*out) + } + } + } if in.DHCPOptionsID != nil { in, out := &in.DHCPOptionsID, &out.DHCPOptionsID *out = new(string) @@ -2533,12 +2656,59 @@ func (in *DHCPOptions) DeepCopyInto(out *DHCPOptions) { } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptions. -func (in *DHCPOptions) DeepCopy() *DHCPOptions { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptionsStatus. +func (in *DHCPOptionsStatus) DeepCopy() *DHCPOptionsStatus { if in == nil { return nil } - out := new(DHCPOptions) + out := new(DHCPOptionsStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *DHCPOptions_SDK) DeepCopyInto(out *DHCPOptions_SDK) { + *out = *in + if in.DHCPConfigurations != nil { + in, out := &in.DHCPConfigurations, &out.DHCPConfigurations + *out = make([]*DHCPConfiguration, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(DHCPConfiguration) + (*in).DeepCopyInto(*out) + } + } + } + if in.DHCPOptionsID != nil { + in, out := &in.DHCPOptionsID, &out.DHCPOptionsID + *out = new(string) + **out = **in + } + if in.OwnerID != nil { + in, out := &in.OwnerID, &out.OwnerID + *out = new(string) + **out = **in + } + if in.Tags != nil { + in, out := &in.Tags, &out.Tags + *out = make([]*Tag, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(Tag) + (*in).DeepCopyInto(*out) + } + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DHCPOptions_SDK. +func (in *DHCPOptions_SDK) DeepCopy() *DHCPOptions_SDK { + if in == nil { + return nil + } + out := new(DHCPOptions_SDK) in.DeepCopyInto(out) return out } diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 03a4f702..15060d87 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -33,6 +33,7 @@ import ( svcresource "github.com/aws-controllers-k8s/ec2-controller/pkg/resource" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + _ "github.com/aws-controllers-k8s/ec2-controller/pkg/resource/dhcp_options" _ "github.com/aws-controllers-k8s/ec2-controller/pkg/resource/internet_gateway" _ "github.com/aws-controllers-k8s/ec2-controller/pkg/resource/route_table" _ "github.com/aws-controllers-k8s/ec2-controller/pkg/resource/security_group" diff --git a/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml b/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml new file mode 100644 index 00000000..4aea35e1 --- /dev/null +++ b/config/crd/bases/ec2.services.k8s.aws_dhcpoptions.yaml @@ -0,0 +1,163 @@ + +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.7.0 + creationTimestamp: null + name: dhcpoptions.ec2.services.k8s.aws +spec: + group: ec2.services.k8s.aws + names: + kind: DHCPOptions + listKind: DHCPOptionsList + plural: dhcpoptions + singular: dhcpoptions + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: DHCPOptions is the Schema for the DHCPOptions API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: "DhcpOptionsSpec defines the desired state of DhcpOptions. + \n Describes a set of DHCP options." + properties: + dhcpConfigurations: + description: A DHCP configuration option. + items: + properties: + key: + type: string + values: + items: + type: string + type: array + type: object + type: array + tagSpecifications: + description: The tags to assign to the DHCP option. + items: + description: The tags to apply to a resource when the resource is + being created. + properties: + resourceType: + type: string + tags: + items: + description: Describes a tag. + properties: + key: + type: string + value: + type: string + type: object + type: array + type: object + type: array + required: + - dhcpConfigurations + type: object + status: + description: DHCPOptionsStatus defines the observed state of DHCPOptions + properties: + ackResourceMetadata: + description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` + member that is used to contain resource sync state, account ownership, + constructed ARN for the resource + properties: + arn: + description: 'ARN is the Amazon Resource Name for the resource. + This is a globally-unique identifier and is set only by the + ACK service controller once the controller has orchestrated + the creation of the resource OR when it has verified that an + "adopted" resource (a resource where the ARN annotation was + set by the Kubernetes user on the CR) exists and matches the + supplied CR''s Spec field values. TODO(vijat@): Find a better + strategy for resources that do not have ARN in CreateOutputResponse + https://github.com/aws/aws-controllers-k8s/issues/270' + type: string + ownerAccountID: + description: OwnerAccountID is the AWS Account ID of the account + that owns the backend AWS service API resource. + type: string + required: + - ownerAccountID + type: object + conditions: + description: All CRS managed by ACK have a common `Status.Conditions` + member that contains a collection of `ackv1alpha1.Condition` objects + that describe the various terminal states of the CR and its backend + AWS service API resource + items: + description: Condition is the common struct used by all CRDs managed + by ACK service controllers to indicate terminal states of the + CR and its backend AWS service API resource + properties: + lastTransitionTime: + description: Last time the condition transitioned from one status + to another. + format: date-time + type: string + message: + description: A human readable message indicating details about + the transition. + type: string + reason: + description: The reason for the condition's last transition. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type is the type of the Condition + type: string + required: + - status + - type + type: object + type: array + dhcpOptionsID: + description: The ID of the set of DHCP options. + type: string + ownerID: + description: The ID of the Amazon Web Services account that owns the + DHCP options set. + type: string + tags: + description: Any tags assigned to the DHCP options set. + items: + description: Describes a tag. + properties: + key: + type: string + value: + type: string + type: object + type: array + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index a79d3613..d0c24d7c 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization bases: - common resources: + - bases/ec2.services.k8s.aws_dhcpoptions.yaml - bases/ec2.services.k8s.aws_internetgateways.yaml - bases/ec2.services.k8s.aws_routetables.yaml - bases/ec2.services.k8s.aws_securitygroups.yaml diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml index 7facd78d..35146c05 100644 --- a/config/rbac/cluster-role-controller.yaml +++ b/config/rbac/cluster-role-controller.yaml @@ -22,6 +22,26 @@ rules: - get - list - watch +- apiGroups: + - ec2.services.k8s.aws + resources: + - dhcpoptions + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - ec2.services.k8s.aws + resources: + - dhcpoptions/status + verbs: + - get + - patch + - update - apiGroups: - ec2.services.k8s.aws resources: diff --git a/config/rbac/role-reader.yaml b/config/rbac/role-reader.yaml index b39412ee..713e5719 100644 --- a/config/rbac/role-reader.yaml +++ b/config/rbac/role-reader.yaml @@ -9,6 +9,7 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions - internetgateways - routetables - securitygroups diff --git a/config/rbac/role-writer.yaml b/config/rbac/role-writer.yaml index eda07d85..0630fe62 100644 --- a/config/rbac/role-writer.yaml +++ b/config/rbac/role-writer.yaml @@ -9,6 +9,7 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions - internetgateways - routetables - securitygroups @@ -27,6 +28,7 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions - internetgateways - routetables - securitygroups diff --git a/generator.yaml b/generator.yaml index 5bedf271..1d63c272 100644 --- a/generator.yaml +++ b/generator.yaml @@ -3,6 +3,7 @@ ignore: - ModifyTransitGateway - ModifyVpcEndpoint field_paths: + - CreateDhcpOptionsInput.DryRun - CreateInternetGatewayInput.DryRun - CreateRouteInput.DryRun - CreateRouteInput.RouteTableId @@ -26,6 +27,7 @@ ignore: - CustomerGateway - DefaultSubnet - DefaultVpc + #- DhcpOptions - EgressOnlyInternetGateway - Fleet - FpgaImage @@ -91,6 +93,11 @@ operations: resource_name: VpcEndpoint resources: + DhcpOptions: + fields: + DHCPConfigurations.Values: + set: + - from: AttributeValue.Value RouteTable: exceptions: terminal_codes: diff --git a/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml b/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml new file mode 100644 index 00000000..4aea35e1 --- /dev/null +++ b/helm/crds/ec2.services.k8s.aws_dhcpoptions.yaml @@ -0,0 +1,163 @@ + +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.7.0 + creationTimestamp: null + name: dhcpoptions.ec2.services.k8s.aws +spec: + group: ec2.services.k8s.aws + names: + kind: DHCPOptions + listKind: DHCPOptionsList + plural: dhcpoptions + singular: dhcpoptions + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: DHCPOptions is the Schema for the DHCPOptions API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: "DhcpOptionsSpec defines the desired state of DhcpOptions. + \n Describes a set of DHCP options." + properties: + dhcpConfigurations: + description: A DHCP configuration option. + items: + properties: + key: + type: string + values: + items: + type: string + type: array + type: object + type: array + tagSpecifications: + description: The tags to assign to the DHCP option. + items: + description: The tags to apply to a resource when the resource is + being created. + properties: + resourceType: + type: string + tags: + items: + description: Describes a tag. + properties: + key: + type: string + value: + type: string + type: object + type: array + type: object + type: array + required: + - dhcpConfigurations + type: object + status: + description: DHCPOptionsStatus defines the observed state of DHCPOptions + properties: + ackResourceMetadata: + description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` + member that is used to contain resource sync state, account ownership, + constructed ARN for the resource + properties: + arn: + description: 'ARN is the Amazon Resource Name for the resource. + This is a globally-unique identifier and is set only by the + ACK service controller once the controller has orchestrated + the creation of the resource OR when it has verified that an + "adopted" resource (a resource where the ARN annotation was + set by the Kubernetes user on the CR) exists and matches the + supplied CR''s Spec field values. TODO(vijat@): Find a better + strategy for resources that do not have ARN in CreateOutputResponse + https://github.com/aws/aws-controllers-k8s/issues/270' + type: string + ownerAccountID: + description: OwnerAccountID is the AWS Account ID of the account + that owns the backend AWS service API resource. + type: string + required: + - ownerAccountID + type: object + conditions: + description: All CRS managed by ACK have a common `Status.Conditions` + member that contains a collection of `ackv1alpha1.Condition` objects + that describe the various terminal states of the CR and its backend + AWS service API resource + items: + description: Condition is the common struct used by all CRDs managed + by ACK service controllers to indicate terminal states of the + CR and its backend AWS service API resource + properties: + lastTransitionTime: + description: Last time the condition transitioned from one status + to another. + format: date-time + type: string + message: + description: A human readable message indicating details about + the transition. + type: string + reason: + description: The reason for the condition's last transition. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type is the type of the Condition + type: string + required: + - status + - type + type: object + type: array + dhcpOptionsID: + description: The ID of the set of DHCP options. + type: string + ownerID: + description: The ID of the Amazon Web Services account that owns the + DHCP options set. + type: string + tags: + description: Any tags assigned to the DHCP options set. + items: + description: Describes a tag. + properties: + key: + type: string + value: + type: string + type: object + type: array + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml index 810f8fa7..57a4bcd5 100644 --- a/helm/templates/cluster-role-controller.yaml +++ b/helm/templates/cluster-role-controller.yaml @@ -28,6 +28,26 @@ rules: - get - list - watch +- apiGroups: + - ec2.services.k8s.aws + resources: + - dhcpoptions + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - ec2.services.k8s.aws + resources: + - dhcpoptions/status + verbs: + - get + - patch + - update - apiGroups: - ec2.services.k8s.aws resources: diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index c7c9d0ec..d3a307a7 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -33,6 +33,12 @@ spec: {{- end }} spec: serviceAccountName: {{ include "service-account.name" . }} + {{- if .Values.image.pullSecrets }} + imagePullSecrets: + {{- range .Values.image.pullSecrets }} + - name: {{ . }} + {{- end }} + {{- end }} containers: - command: - ./bin/controller @@ -50,6 +56,7 @@ spec: - --watch-namespace - "$(ACK_WATCH_NAMESPACE)" image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} name: controller ports: - name: http diff --git a/helm/templates/role-reader.yaml b/helm/templates/role-reader.yaml index 1770ff53..5fa48e9d 100644 --- a/helm/templates/role-reader.yaml +++ b/helm/templates/role-reader.yaml @@ -9,6 +9,7 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions - internetgateways - routetables - securitygroups diff --git a/helm/templates/role-writer.yaml b/helm/templates/role-writer.yaml index 94a097b6..cbc25b68 100644 --- a/helm/templates/role-writer.yaml +++ b/helm/templates/role-writer.yaml @@ -9,6 +9,8 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions + - internetgateways - routetables @@ -34,6 +36,7 @@ rules: - apiGroups: - ec2.services.k8s.aws resources: + - dhcpoptions - internetgateways - routetables - securitygroups diff --git a/pkg/resource/dhcp_options/delta.go b/pkg/resource/dhcp_options/delta.go new file mode 100644 index 00000000..f74c33a7 --- /dev/null +++ b/pkg/resource/dhcp_options/delta.go @@ -0,0 +1,52 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + "bytes" + "reflect" + + ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" +) + +// Hack to avoid import errors during build... +var ( + _ = &bytes.Buffer{} + _ = &reflect.Method{} +) + +// newResourceDelta returns a new `ackcompare.Delta` used to compare two +// resources +func newResourceDelta( + a *resource, + b *resource, +) *ackcompare.Delta { + delta := ackcompare.NewDelta() + if (a == nil && b != nil) || + (a != nil && b == nil) { + delta.Add("", a, b) + return delta + } + + if !reflect.DeepEqual(a.ko.Spec.DHCPConfigurations, b.ko.Spec.DHCPConfigurations) { + delta.Add("Spec.DHCPConfigurations", a.ko.Spec.DHCPConfigurations, b.ko.Spec.DHCPConfigurations) + } + if !reflect.DeepEqual(a.ko.Spec.TagSpecifications, b.ko.Spec.TagSpecifications) { + delta.Add("Spec.TagSpecifications", a.ko.Spec.TagSpecifications, b.ko.Spec.TagSpecifications) + } + + return delta +} diff --git a/pkg/resource/dhcp_options/descriptor.go b/pkg/resource/dhcp_options/descriptor.go new file mode 100644 index 00000000..54664776 --- /dev/null +++ b/pkg/resource/dhcp_options/descriptor.go @@ -0,0 +1,154 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" + acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + rtclient "sigs.k8s.io/controller-runtime/pkg/client" + k8sctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + svcapitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" +) + +const ( + finalizerString = "finalizers.ec2.services.k8s.aws/DHCPOptions" +) + +var ( + GroupVersionResource = svcapitypes.GroupVersion.WithResource("dhcpoptions") + GroupKind = metav1.GroupKind{ + Group: "ec2.services.k8s.aws", + Kind: "DHCPOptions", + } +) + +// resourceDescriptor implements the +// `aws-service-operator-k8s/pkg/types.AWSResourceDescriptor` interface +type resourceDescriptor struct { +} + +// GroupKind returns a Kubernetes metav1.GroupKind struct that describes the +// API Group and Kind of CRs described by the descriptor +func (d *resourceDescriptor) GroupKind() *metav1.GroupKind { + return &GroupKind +} + +// EmptyRuntimeObject returns an empty object prototype that may be used in +// apimachinery and k8s client operations +func (d *resourceDescriptor) EmptyRuntimeObject() rtclient.Object { + return &svcapitypes.DHCPOptions{} +} + +// ResourceFromRuntimeObject returns an AWSResource that has been initialized +// with the supplied runtime.Object +func (d *resourceDescriptor) ResourceFromRuntimeObject( + obj rtclient.Object, +) acktypes.AWSResource { + return &resource{ + ko: obj.(*svcapitypes.DHCPOptions), + } +} + +// Delta returns an `ackcompare.Delta` object containing the difference between +// one `AWSResource` and another. +func (d *resourceDescriptor) Delta(a, b acktypes.AWSResource) *ackcompare.Delta { + return newResourceDelta(a.(*resource), b.(*resource)) +} + +// IsManaged returns true if the supplied AWSResource is under the management +// of an ACK service controller. What this means in practice is that the +// underlying custom resource (CR) in the AWSResource has had a +// resource-specific finalizer associated with it. +func (d *resourceDescriptor) IsManaged( + res acktypes.AWSResource, +) bool { + obj := res.RuntimeObject() + if obj == nil { + // Should not happen. If it does, there is a bug in the code + panic("nil RuntimeMetaObject in AWSResource") + } + // Remove use of custom code once + // https://github.com/kubernetes-sigs/controller-runtime/issues/994 is + // fixed. This should be able to be: + // + // return k8sctrlutil.ContainsFinalizer(obj, finalizerString) + return containsFinalizer(obj, finalizerString) +} + +// Remove once https://github.com/kubernetes-sigs/controller-runtime/issues/994 +// is fixed. +func containsFinalizer(obj rtclient.Object, finalizer string) bool { + f := obj.GetFinalizers() + for _, e := range f { + if e == finalizer { + return true + } + } + return false +} + +// MarkManaged places the supplied resource under the management of ACK. What +// this typically means is that the resource manager will decorate the +// underlying custom resource (CR) with a finalizer that indicates ACK is +// managing the resource and the underlying CR may not be deleted until ACK is +// finished cleaning up any backend AWS service resources associated with the +// CR. +func (d *resourceDescriptor) MarkManaged( + res acktypes.AWSResource, +) { + obj := res.RuntimeObject() + if obj == nil { + // Should not happen. If it does, there is a bug in the code + panic("nil RuntimeMetaObject in AWSResource") + } + k8sctrlutil.AddFinalizer(obj, finalizerString) +} + +// MarkUnmanaged removes the supplied resource from management by ACK. What +// this typically means is that the resource manager will remove a finalizer +// underlying custom resource (CR) that indicates ACK is managing the resource. +// This will allow the Kubernetes API server to delete the underlying CR. +func (d *resourceDescriptor) MarkUnmanaged( + res acktypes.AWSResource, +) { + obj := res.RuntimeObject() + if obj == nil { + // Should not happen. If it does, there is a bug in the code + panic("nil RuntimeMetaObject in AWSResource") + } + k8sctrlutil.RemoveFinalizer(obj, finalizerString) +} + +// MarkAdopted places descriptors on the custom resource that indicate the +// resource was not created from within ACK. +func (d *resourceDescriptor) MarkAdopted( + res acktypes.AWSResource, +) { + obj := res.RuntimeObject() + if obj == nil { + // Should not happen. If it does, there is a bug in the code + panic("nil RuntimeObject in AWSResource") + } + curr := obj.GetAnnotations() + if curr == nil { + curr = make(map[string]string) + } + curr[ackv1alpha1.AnnotationAdopted] = "true" + obj.SetAnnotations(curr) +} diff --git a/pkg/resource/dhcp_options/identifiers.go b/pkg/resource/dhcp_options/identifiers.go new file mode 100644 index 00000000..381e83e4 --- /dev/null +++ b/pkg/resource/dhcp_options/identifiers.go @@ -0,0 +1,46 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" +) + +// resourceIdentifiers implements the +// `aws-service-operator-k8s/pkg/types.AWSResourceIdentifiers` interface +type resourceIdentifiers struct { + meta *ackv1alpha1.ResourceMetadata +} + +// ARN returns the AWS Resource Name for the backend AWS resource. If nil, +// this means the resource has not yet been created in the backend AWS +// service. +func (ri *resourceIdentifiers) ARN() *ackv1alpha1.AWSResourceName { + if ri.meta != nil { + return ri.meta.ARN + } + return nil +} + +// OwnerAccountID returns the AWS account identifier in which the +// backend AWS resource resides, or nil if this information is not known +// for the resource +func (ri *resourceIdentifiers) OwnerAccountID() *ackv1alpha1.AWSAccountID { + if ri.meta != nil { + return ri.meta.OwnerAccountID + } + return nil +} diff --git a/pkg/resource/dhcp_options/manager.go b/pkg/resource/dhcp_options/manager.go new file mode 100644 index 00000000..2e78399f --- /dev/null +++ b/pkg/resource/dhcp_options/manager.go @@ -0,0 +1,320 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + "context" + "fmt" + "time" + + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" + ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" + ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config" + ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics" + ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue" + ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" + acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" + ackutil "github.com/aws-controllers-k8s/runtime/pkg/util" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + + svcsdk "github.com/aws/aws-sdk-go/service/ec2" + svcsdkapi "github.com/aws/aws-sdk-go/service/ec2/ec2iface" +) + +var ( + _ = ackutil.InStrings +) + +// +kubebuilder:rbac:groups=ec2.services.k8s.aws,resources=dhcpoptions,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=ec2.services.k8s.aws,resources=dhcpoptions/status,verbs=get;update;patch + +var lateInitializeFieldNames = []string{} + +// resourceManager is responsible for providing a consistent way to perform +// CRUD operations in a backend AWS service API for Book custom resources. +type resourceManager struct { + // cfg is a copy of the ackcfg.Config object passed on start of the service + // controller + cfg ackcfg.Config + // log refers to the logr.Logger object handling logging for the service + // controller + log logr.Logger + // metrics contains a collection of Prometheus metric objects that the + // service controller and its reconcilers track + metrics *ackmetrics.Metrics + // rr is the Reconciler which can be used for various utility + // functions such as querying for Secret values given a SecretReference + rr acktypes.Reconciler + // awsAccountID is the AWS account identifier that contains the resources + // managed by this resource manager + awsAccountID ackv1alpha1.AWSAccountID + // The AWS Region that this resource manager targets + awsRegion ackv1alpha1.AWSRegion + // sess is the AWS SDK Session object used to communicate with the backend + // AWS service API + sess *session.Session + // sdk is a pointer to the AWS service API interface exposed by the + // aws-sdk-go/services/{alias}/{alias}iface package. + sdkapi svcsdkapi.EC2API +} + +// concreteResource returns a pointer to a resource from the supplied +// generic AWSResource interface +func (rm *resourceManager) concreteResource( + res acktypes.AWSResource, +) *resource { + // cast the generic interface into a pointer type specific to the concrete + // implementing resource type managed by this resource manager + return res.(*resource) +} + +// ReadOne returns the currently-observed state of the supplied AWSResource in +// the backend AWS service API. +func (rm *resourceManager) ReadOne( + ctx context.Context, + res acktypes.AWSResource, +) (acktypes.AWSResource, error) { + r := rm.concreteResource(res) + if r.ko == nil { + // Should never happen... if it does, it's buggy code. + panic("resource manager's ReadOne() method received resource with nil CR object") + } + observed, err := rm.sdkFind(ctx, r) + if err != nil { + if observed != nil { + return rm.onError(observed, err) + } + return rm.onError(r, err) + } + return rm.onSuccess(observed) +} + +// Create attempts to create the supplied AWSResource in the backend AWS +// service API, returning an AWSResource representing the newly-created +// resource +func (rm *resourceManager) Create( + ctx context.Context, + res acktypes.AWSResource, +) (acktypes.AWSResource, error) { + r := rm.concreteResource(res) + if r.ko == nil { + // Should never happen... if it does, it's buggy code. + panic("resource manager's Create() method received resource with nil CR object") + } + created, err := rm.sdkCreate(ctx, r) + if err != nil { + return rm.onError(r, err) + } + return rm.onSuccess(created) +} + +// Update attempts to mutate the supplied desired AWSResource in the backend AWS +// service API, returning an AWSResource representing the newly-mutated +// resource. +// Note for specialized logic implementers can check to see how the latest +// observed resource differs from the supplied desired state. The +// higher-level reonciler determines whether or not the desired differs +// from the latest observed and decides whether to call the resource +// manager's Update method +func (rm *resourceManager) Update( + ctx context.Context, + resDesired acktypes.AWSResource, + resLatest acktypes.AWSResource, + delta *ackcompare.Delta, +) (acktypes.AWSResource, error) { + desired := rm.concreteResource(resDesired) + latest := rm.concreteResource(resLatest) + if desired.ko == nil || latest.ko == nil { + // Should never happen... if it does, it's buggy code. + panic("resource manager's Update() method received resource with nil CR object") + } + updated, err := rm.sdkUpdate(ctx, desired, latest, delta) + if err != nil { + return rm.onError(latest, err) + } + return rm.onSuccess(updated) +} + +// Delete attempts to destroy the supplied AWSResource in the backend AWS +// service API, returning an AWSResource representing the +// resource being deleted (if delete is asynchronous and takes time) +func (rm *resourceManager) Delete( + ctx context.Context, + res acktypes.AWSResource, +) (acktypes.AWSResource, error) { + r := rm.concreteResource(res) + if r.ko == nil { + // Should never happen... if it does, it's buggy code. + panic("resource manager's Update() method received resource with nil CR object") + } + observed, err := rm.sdkDelete(ctx, r) + if err != nil { + if observed != nil { + return rm.onError(observed, err) + } + return rm.onError(r, err) + } + + return rm.onSuccess(observed) +} + +// ARNFromName returns an AWS Resource Name from a given string name. This +// is useful for constructing ARNs for APIs that require ARNs in their +// GetAttributes operations but all we have (for new CRs at least) is a +// name for the resource +func (rm *resourceManager) ARNFromName(name string) string { + return fmt.Sprintf( + "arn:aws:ec2:%s:%s:%s", + rm.awsRegion, + rm.awsAccountID, + name, + ) +} + +// LateInitialize returns an acktypes.AWSResource after setting the late initialized +// fields from the readOne call. This method will initialize the optional fields +// which were not provided by the k8s user but were defaulted by the AWS service. +// If there are no such fields to be initialized, the returned object is similar to +// object passed in the parameter. +func (rm *resourceManager) LateInitialize( + ctx context.Context, + latest acktypes.AWSResource, +) (acktypes.AWSResource, error) { + rlog := ackrtlog.FromContext(ctx) + // If there are no fields to late initialize, do nothing + if len(lateInitializeFieldNames) == 0 { + rlog.Debug("no late initialization required.") + return latest, nil + } + latestCopy := latest.DeepCopy() + lateInitConditionReason := "" + lateInitConditionMessage := "" + observed, err := rm.ReadOne(ctx, latestCopy) + if err != nil { + lateInitConditionMessage = "Unable to complete Read operation required for late initialization" + lateInitConditionReason = "Late Initialization Failure" + ackcondition.SetLateInitialized(latestCopy, corev1.ConditionFalse, &lateInitConditionMessage, &lateInitConditionReason) + return latestCopy, err + } + lateInitializedRes := rm.lateInitializeFromReadOneOutput(observed, latestCopy) + incompleteInitialization := rm.incompleteLateInitialization(lateInitializedRes) + if incompleteInitialization { + // Add the condition with LateInitialized=False + lateInitConditionMessage = "Late initialization did not complete, requeuing with delay of 5 seconds" + lateInitConditionReason = "Delayed Late Initialization" + ackcondition.SetLateInitialized(lateInitializedRes, corev1.ConditionFalse, &lateInitConditionMessage, &lateInitConditionReason) + return lateInitializedRes, ackrequeue.NeededAfter(nil, time.Duration(5)*time.Second) + } + // Set LateInitialized condition to True + lateInitConditionMessage = "Late initialization successful" + lateInitConditionReason = "Late initialization successful" + ackcondition.SetLateInitialized(lateInitializedRes, corev1.ConditionTrue, &lateInitConditionMessage, &lateInitConditionReason) + return lateInitializedRes, nil +} + +// incompleteLateInitialization return true if there are fields which were supposed to be +// late initialized but are not. If all the fields are late initialized, false is returned +func (rm *resourceManager) incompleteLateInitialization( + res acktypes.AWSResource, +) bool { + return false +} + +// lateInitializeFromReadOneOutput late initializes the 'latest' resource from the 'observed' +// resource and returns 'latest' resource +func (rm *resourceManager) lateInitializeFromReadOneOutput( + observed acktypes.AWSResource, + latest acktypes.AWSResource, +) acktypes.AWSResource { + return latest +} + +// IsSynced returns true if the resource is synced. +func (rm *resourceManager) IsSynced(ctx context.Context, res acktypes.AWSResource) (bool, error) { + r := rm.concreteResource(res) + if r.ko == nil { + // Should never happen... if it does, it's buggy code. + panic("resource manager's IsSynced() method received resource with nil CR object") + } + + return true, nil +} + +// newResourceManager returns a new struct implementing +// acktypes.AWSResourceManager +func newResourceManager( + cfg ackcfg.Config, + log logr.Logger, + metrics *ackmetrics.Metrics, + rr acktypes.Reconciler, + sess *session.Session, + id ackv1alpha1.AWSAccountID, + region ackv1alpha1.AWSRegion, +) (*resourceManager, error) { + return &resourceManager{ + cfg: cfg, + log: log, + metrics: metrics, + rr: rr, + awsAccountID: id, + awsRegion: region, + sess: sess, + sdkapi: svcsdk.New(sess), + }, nil +} + +// onError updates resource conditions and returns updated resource +// it returns nil if no condition is updated. +func (rm *resourceManager) onError( + r *resource, + err error, +) (acktypes.AWSResource, error) { + if r == nil { + return nil, err + } + r1, updated := rm.updateConditions(r, false, err) + if !updated { + return r, err + } + for _, condition := range r1.Conditions() { + if condition.Type == ackv1alpha1.ConditionTypeTerminal && + condition.Status == corev1.ConditionTrue { + // resource is in Terminal condition + // return Terminal error + return r1, ackerr.Terminal + } + } + return r1, err +} + +// onSuccess updates resource conditions and returns updated resource +// it returns the supplied resource if no condition is updated. +func (rm *resourceManager) onSuccess( + r *resource, +) (acktypes.AWSResource, error) { + if r == nil { + return nil, nil + } + r1, updated := rm.updateConditions(r, true, nil) + if !updated { + return r, nil + } + return r1, nil +} diff --git a/pkg/resource/dhcp_options/manager_factory.go b/pkg/resource/dhcp_options/manager_factory.go new file mode 100644 index 00000000..9498acd3 --- /dev/null +++ b/pkg/resource/dhcp_options/manager_factory.go @@ -0,0 +1,96 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + "fmt" + "sync" + + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcfg "github.com/aws-controllers-k8s/runtime/pkg/config" + ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics" + acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/go-logr/logr" + + svcresource "github.com/aws-controllers-k8s/ec2-controller/pkg/resource" +) + +// resourceManagerFactory produces resourceManager objects. It implements the +// `types.AWSResourceManagerFactory` interface. +type resourceManagerFactory struct { + sync.RWMutex + // rmCache contains resource managers for a particular AWS account ID + rmCache map[string]*resourceManager +} + +// ResourcePrototype returns an AWSResource that resource managers produced by +// this factory will handle +func (f *resourceManagerFactory) ResourceDescriptor() acktypes.AWSResourceDescriptor { + return &resourceDescriptor{} +} + +// ManagerFor returns a resource manager object that can manage resources for a +// supplied AWS account +func (f *resourceManagerFactory) ManagerFor( + cfg ackcfg.Config, + log logr.Logger, + metrics *ackmetrics.Metrics, + rr acktypes.Reconciler, + sess *session.Session, + id ackv1alpha1.AWSAccountID, + region ackv1alpha1.AWSRegion, +) (acktypes.AWSResourceManager, error) { + rmId := fmt.Sprintf("%s/%s", id, region) + f.RLock() + rm, found := f.rmCache[rmId] + f.RUnlock() + + if found { + return rm, nil + } + + f.Lock() + defer f.Unlock() + + rm, err := newResourceManager(cfg, log, metrics, rr, sess, id, region) + if err != nil { + return nil, err + } + f.rmCache[rmId] = rm + return rm, nil +} + +// IsAdoptable returns true if the resource is able to be adopted +func (f *resourceManagerFactory) IsAdoptable() bool { + return true +} + +// RequeueOnSuccessSeconds returns true if the resource should be requeued after specified seconds +// Default is false which means resource will not be requeued after success. +func (f *resourceManagerFactory) RequeueOnSuccessSeconds() int { + return 0 +} + +func newResourceManagerFactory() *resourceManagerFactory { + return &resourceManagerFactory{ + rmCache: map[string]*resourceManager{}, + } +} + +func init() { + svcresource.RegisterManagerFactory(newResourceManagerFactory()) +} diff --git a/pkg/resource/dhcp_options/references.go b/pkg/resource/dhcp_options/references.go new file mode 100644 index 00000000..46ec74d9 --- /dev/null +++ b/pkg/resource/dhcp_options/references.go @@ -0,0 +1,52 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + "context" + "sigs.k8s.io/controller-runtime/pkg/client" + + acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" + + svcapitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" +) + +// ResolveReferences finds if there are any Reference field(s) present +// inside AWSResource passed in the parameter and attempts to resolve +// those reference field(s) into target field(s). +// It returns an AWSResource with resolved reference(s), and an error if the +// passed AWSResource's reference field(s) cannot be resolved. +// This method also adds/updates the ConditionTypeReferencesResolved for the +// AWSResource. +func (rm *resourceManager) ResolveReferences( + ctx context.Context, + apiReader client.Reader, + res acktypes.AWSResource, +) (acktypes.AWSResource, error) { + return res, nil +} + +// validateReferenceFields validates the reference field and corresponding +// identifier field. +func validateReferenceFields(ko *svcapitypes.DHCPOptions) error { + return nil +} + +// hasNonNilReferences returns true if resource contains a reference to another +// resource +func hasNonNilReferences(ko *svcapitypes.DHCPOptions) bool { + return false +} diff --git a/pkg/resource/dhcp_options/resource.go b/pkg/resource/dhcp_options/resource.go new file mode 100644 index 00000000..7e17be13 --- /dev/null +++ b/pkg/resource/dhcp_options/resource.go @@ -0,0 +1,100 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackerrors "github.com/aws-controllers-k8s/runtime/pkg/errors" + acktypes "github.com/aws-controllers-k8s/runtime/pkg/types" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + rtclient "sigs.k8s.io/controller-runtime/pkg/client" + + svcapitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" +) + +// Hack to avoid import errors during build... +var ( + _ = &ackerrors.MissingNameIdentifier +) + +// resource implements the `aws-controller-k8s/runtime/pkg/types.AWSResource` +// interface +type resource struct { + // The Kubernetes-native CR representing the resource + ko *svcapitypes.DHCPOptions +} + +// Identifiers returns an AWSResourceIdentifiers object containing various +// identifying information, including the AWS account ID that owns the +// resource, the resource's AWS Resource Name (ARN) +func (r *resource) Identifiers() acktypes.AWSResourceIdentifiers { + return &resourceIdentifiers{r.ko.Status.ACKResourceMetadata} +} + +// IsBeingDeleted returns true if the Kubernetes resource has a non-zero +// deletion timestemp +func (r *resource) IsBeingDeleted() bool { + return !r.ko.DeletionTimestamp.IsZero() +} + +// RuntimeObject returns the Kubernetes apimachinery/runtime representation of +// the AWSResource +func (r *resource) RuntimeObject() rtclient.Object { + return r.ko +} + +// MetaObject returns the Kubernetes apimachinery/apis/meta/v1.Object +// representation of the AWSResource +func (r *resource) MetaObject() metav1.Object { + return r.ko.GetObjectMeta() +} + +// Conditions returns the ACK Conditions collection for the AWSResource +func (r *resource) Conditions() []*ackv1alpha1.Condition { + return r.ko.Status.Conditions +} + +// ReplaceConditions sets the Conditions status field for the resource +func (r *resource) ReplaceConditions(conditions []*ackv1alpha1.Condition) { + r.ko.Status.Conditions = conditions +} + +// SetObjectMeta sets the ObjectMeta field for the resource +func (r *resource) SetObjectMeta(meta metav1.ObjectMeta) { + r.ko.ObjectMeta = meta +} + +// SetStatus will set the Status field for the resource +func (r *resource) SetStatus(desired acktypes.AWSResource) { + r.ko.Status = desired.(*resource).ko.Status +} + +// SetIdentifiers sets the Spec or Status field that is referenced as the unique +// resource identifier +func (r *resource) SetIdentifiers(identifier *ackv1alpha1.AWSIdentifiers) error { + if identifier.NameOrID == "" { + return ackerrors.MissingNameIdentifier + } + r.ko.Status.DHCPOptionsID = &identifier.NameOrID + + return nil +} + +// DeepCopy will return a copy of the resource +func (r *resource) DeepCopy() acktypes.AWSResource { + koCopy := r.ko.DeepCopy() + return &resource{koCopy} +} diff --git a/pkg/resource/dhcp_options/sdk.go b/pkg/resource/dhcp_options/sdk.go new file mode 100644 index 00000000..163e19cb --- /dev/null +++ b/pkg/resource/dhcp_options/sdk.go @@ -0,0 +1,452 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"). You may +// not use this file except in compliance with the License. A copy of the +// License is located at +// +// http://aws.amazon.com/apache2.0/ +// +// or in the "license" file accompanying this file. This file is distributed +// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +// express or implied. See the License for the specific language governing +// permissions and limitations under the License. + +// Code generated by ack-generate. DO NOT EDIT. + +package dhcp_options + +import ( + "context" + "reflect" + "strings" + + ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" + ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" + ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition" + ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors" + ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log" + "github.com/aws/aws-sdk-go/aws" + svcsdk "github.com/aws/aws-sdk-go/service/ec2" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + svcapitypes "github.com/aws-controllers-k8s/ec2-controller/apis/v1alpha1" +) + +// Hack to avoid import errors during build... +var ( + _ = &metav1.Time{} + _ = strings.ToLower("") + _ = &aws.JSONValue{} + _ = &svcsdk.EC2{} + _ = &svcapitypes.DHCPOptions{} + _ = ackv1alpha1.AWSAccountID("") + _ = &ackerr.NotFound + _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} +) + +// sdkFind returns SDK-specific information about a supplied resource +func (rm *resourceManager) sdkFind( + ctx context.Context, + r *resource, +) (latest *resource, err error) { + rlog := ackrtlog.FromContext(ctx) + exit := rlog.Trace("rm.sdkFind") + defer exit(err) + // If any required fields in the input shape are missing, AWS resource is + // not created yet. Return NotFound here to indicate to callers that the + // resource isn't yet created. + if rm.requiredFieldsMissingFromReadManyInput(r) { + return nil, ackerr.NotFound + } + + input, err := rm.newListRequestPayload(r) + if err != nil { + return nil, err + } + var resp *svcsdk.DescribeDhcpOptionsOutput + resp, err = rm.sdkapi.DescribeDhcpOptionsWithContext(ctx, input) + rm.metrics.RecordAPICall("READ_MANY", "DescribeDhcpOptions", err) + if err != nil { + if awsErr, ok := ackerr.AWSError(err); ok && awsErr.Code() == "UNKNOWN" { + return nil, ackerr.NotFound + } + return nil, err + } + + // Merge in the information we read from the API call above to the copy of + // the original Kubernetes object we passed to the function + ko := r.ko.DeepCopy() + + found := false + for _, elem := range resp.DhcpOptions { + if elem.DhcpConfigurations != nil { + f0 := []*svcapitypes.NewDHCPConfiguration{} + for _, f0iter := range elem.DhcpConfigurations { + f0elem := &svcapitypes.NewDHCPConfiguration{} + if f0iter.Key != nil { + f0elem.Key = f0iter.Key + } + if f0iter.Values != nil { + f0elemf1 := []*string{} + for _, f0elemf1iter := range f0iter.Values { + var f0elemf1elem string + if f0elemf1iter.Value != nil { + f0elemf1elem = *f0elemf1iter.Value + } + f0elemf1 = append(f0elemf1, &f0elemf1elem) + } + f0elem.Values = f0elemf1 + } + f0 = append(f0, f0elem) + } + ko.Spec.DHCPConfigurations = f0 + } else { + ko.Spec.DHCPConfigurations = nil + } + if elem.DhcpOptionsId != nil { + ko.Status.DHCPOptionsID = elem.DhcpOptionsId + } else { + ko.Status.DHCPOptionsID = nil + } + if elem.OwnerId != nil { + ko.Status.OwnerID = elem.OwnerId + } else { + ko.Status.OwnerID = nil + } + if elem.Tags != nil { + f3 := []*svcapitypes.Tag{} + for _, f3iter := range elem.Tags { + f3elem := &svcapitypes.Tag{} + if f3iter.Key != nil { + f3elem.Key = f3iter.Key + } + if f3iter.Value != nil { + f3elem.Value = f3iter.Value + } + f3 = append(f3, f3elem) + } + ko.Status.Tags = f3 + } else { + ko.Status.Tags = nil + } + found = true + break + } + if !found { + return nil, ackerr.NotFound + } + + rm.setStatusDefaults(ko) + return &resource{ko}, nil +} + +// requiredFieldsMissingFromReadManyInput returns true if there are any fields +// for the ReadMany Input shape that are required but not present in the +// resource's Spec or Status +func (rm *resourceManager) requiredFieldsMissingFromReadManyInput( + r *resource, +) bool { + return r.ko.Status.DHCPOptionsID == nil + +} + +// newListRequestPayload returns SDK-specific struct for the HTTP request +// payload of the List API call for the resource +func (rm *resourceManager) newListRequestPayload( + r *resource, +) (*svcsdk.DescribeDhcpOptionsInput, error) { + res := &svcsdk.DescribeDhcpOptionsInput{} + + if r.ko.Status.DHCPOptionsID != nil { + f0 := []*string{} + f0 = append(f0, r.ko.Status.DHCPOptionsID) + res.SetDhcpOptionsIds(f0) + } + + return res, nil +} + +// sdkCreate creates the supplied resource in the backend AWS service API and +// returns a copy of the resource with resource fields (in both Spec and +// Status) filled in with values from the CREATE API operation's Output shape. +func (rm *resourceManager) sdkCreate( + ctx context.Context, + desired *resource, +) (created *resource, err error) { + rlog := ackrtlog.FromContext(ctx) + exit := rlog.Trace("rm.sdkCreate") + defer exit(err) + input, err := rm.newCreateRequestPayload(ctx, desired) + if err != nil { + return nil, err + } + + var resp *svcsdk.CreateDhcpOptionsOutput + _ = resp + resp, err = rm.sdkapi.CreateDhcpOptionsWithContext(ctx, input) + rm.metrics.RecordAPICall("CREATE", "CreateDhcpOptions", err) + if err != nil { + return nil, err + } + // Merge in the information we read from the API call above to the copy of + // the original Kubernetes object we passed to the function + ko := desired.ko.DeepCopy() + + if resp.DhcpOptions.DhcpConfigurations != nil { + f0 := []*svcapitypes.NewDHCPConfiguration{} + for _, f0iter := range resp.DhcpOptions.DhcpConfigurations { + f0elem := &svcapitypes.NewDHCPConfiguration{} + if f0iter.Key != nil { + f0elem.Key = f0iter.Key + } + if f0iter.Values != nil { + f0elemf1 := []*string{} + for _, f0elemf1iter := range f0iter.Values { + var f0elemf1elem string + if f0elemf1iter.Value != nil { + f0elemf1elem = *f0elemf1iter.Value + } + f0elemf1 = append(f0elemf1, &f0elemf1elem) + } + f0elem.Values = f0elemf1 + } + f0 = append(f0, f0elem) + } + ko.Spec.DHCPConfigurations = f0 + } else { + ko.Spec.DHCPConfigurations = nil + } + if resp.DhcpOptions.DhcpOptionsId != nil { + ko.Status.DHCPOptionsID = resp.DhcpOptions.DhcpOptionsId + } else { + ko.Status.DHCPOptionsID = nil + } + if resp.DhcpOptions.OwnerId != nil { + ko.Status.OwnerID = resp.DhcpOptions.OwnerId + } else { + ko.Status.OwnerID = nil + } + if resp.DhcpOptions.Tags != nil { + f3 := []*svcapitypes.Tag{} + for _, f3iter := range resp.DhcpOptions.Tags { + f3elem := &svcapitypes.Tag{} + if f3iter.Key != nil { + f3elem.Key = f3iter.Key + } + if f3iter.Value != nil { + f3elem.Value = f3iter.Value + } + f3 = append(f3, f3elem) + } + ko.Status.Tags = f3 + } else { + ko.Status.Tags = nil + } + + rm.setStatusDefaults(ko) + return &resource{ko}, nil +} + +// newCreateRequestPayload returns an SDK-specific struct for the HTTP request +// payload of the Create API call for the resource +func (rm *resourceManager) newCreateRequestPayload( + ctx context.Context, + r *resource, +) (*svcsdk.CreateDhcpOptionsInput, error) { + res := &svcsdk.CreateDhcpOptionsInput{} + + if r.ko.Spec.DHCPConfigurations != nil { + f0 := []*svcsdk.NewDhcpConfiguration{} + for _, f0iter := range r.ko.Spec.DHCPConfigurations { + f0elem := &svcsdk.NewDhcpConfiguration{} + if f0iter.Key != nil { + f0elem.SetKey(*f0iter.Key) + } + if f0iter.Values != nil { + f0elemf1 := []*string{} + for _, f0elemf1iter := range f0iter.Values { + var f0elemf1elem string + f0elemf1elem = *f0elemf1iter + f0elemf1 = append(f0elemf1, &f0elemf1elem) + } + f0elem.SetValues(f0elemf1) + } + f0 = append(f0, f0elem) + } + res.SetDhcpConfigurations(f0) + } + if r.ko.Spec.TagSpecifications != nil { + f1 := []*svcsdk.TagSpecification{} + for _, f1iter := range r.ko.Spec.TagSpecifications { + f1elem := &svcsdk.TagSpecification{} + if f1iter.ResourceType != nil { + f1elem.SetResourceType(*f1iter.ResourceType) + } + if f1iter.Tags != nil { + f1elemf1 := []*svcsdk.Tag{} + for _, f1elemf1iter := range f1iter.Tags { + f1elemf1elem := &svcsdk.Tag{} + if f1elemf1iter.Key != nil { + f1elemf1elem.SetKey(*f1elemf1iter.Key) + } + if f1elemf1iter.Value != nil { + f1elemf1elem.SetValue(*f1elemf1iter.Value) + } + f1elemf1 = append(f1elemf1, f1elemf1elem) + } + f1elem.SetTags(f1elemf1) + } + f1 = append(f1, f1elem) + } + res.SetTagSpecifications(f1) + } + + return res, nil +} + +// sdkUpdate patches the supplied resource in the backend AWS service API and +// returns a new resource with updated fields. +func (rm *resourceManager) sdkUpdate( + ctx context.Context, + desired *resource, + latest *resource, + delta *ackcompare.Delta, +) (*resource, error) { + // TODO(jaypipes): Figure this out... + return nil, ackerr.NotImplemented +} + +// sdkDelete deletes the supplied resource in the backend AWS service API +func (rm *resourceManager) sdkDelete( + ctx context.Context, + r *resource, +) (latest *resource, err error) { + rlog := ackrtlog.FromContext(ctx) + exit := rlog.Trace("rm.sdkDelete") + defer exit(err) + input, err := rm.newDeleteRequestPayload(r) + if err != nil { + return nil, err + } + var resp *svcsdk.DeleteDhcpOptionsOutput + _ = resp + resp, err = rm.sdkapi.DeleteDhcpOptionsWithContext(ctx, input) + rm.metrics.RecordAPICall("DELETE", "DeleteDhcpOptions", err) + return nil, err +} + +// newDeleteRequestPayload returns an SDK-specific struct for the HTTP request +// payload of the Delete API call for the resource +func (rm *resourceManager) newDeleteRequestPayload( + r *resource, +) (*svcsdk.DeleteDhcpOptionsInput, error) { + res := &svcsdk.DeleteDhcpOptionsInput{} + + if r.ko.Status.DHCPOptionsID != nil { + res.SetDhcpOptionsId(*r.ko.Status.DHCPOptionsID) + } + + return res, nil +} + +// setStatusDefaults sets default properties into supplied custom resource +func (rm *resourceManager) setStatusDefaults( + ko *svcapitypes.DHCPOptions, +) { + if ko.Status.ACKResourceMetadata == nil { + ko.Status.ACKResourceMetadata = &ackv1alpha1.ResourceMetadata{} + } + if ko.Status.ACKResourceMetadata.OwnerAccountID == nil { + ko.Status.ACKResourceMetadata.OwnerAccountID = &rm.awsAccountID + } + if ko.Status.Conditions == nil { + ko.Status.Conditions = []*ackv1alpha1.Condition{} + } +} + +// updateConditions returns updated resource, true; if conditions were updated +// else it returns nil, false +func (rm *resourceManager) updateConditions( + r *resource, + onSuccess bool, + err error, +) (*resource, bool) { + ko := r.ko.DeepCopy() + rm.setStatusDefaults(ko) + + // Terminal condition + var terminalCondition *ackv1alpha1.Condition = nil + var recoverableCondition *ackv1alpha1.Condition = nil + var syncCondition *ackv1alpha1.Condition = nil + for _, condition := range ko.Status.Conditions { + if condition.Type == ackv1alpha1.ConditionTypeTerminal { + terminalCondition = condition + } + if condition.Type == ackv1alpha1.ConditionTypeRecoverable { + recoverableCondition = condition + } + if condition.Type == ackv1alpha1.ConditionTypeResourceSynced { + syncCondition = condition + } + } + + if rm.terminalAWSError(err) || err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound { + if terminalCondition == nil { + terminalCondition = &ackv1alpha1.Condition{ + Type: ackv1alpha1.ConditionTypeTerminal, + } + ko.Status.Conditions = append(ko.Status.Conditions, terminalCondition) + } + var errorMessage = "" + if err == ackerr.SecretTypeNotSupported || err == ackerr.SecretNotFound { + errorMessage = err.Error() + } else { + awsErr, _ := ackerr.AWSError(err) + errorMessage = awsErr.Error() + } + terminalCondition.Status = corev1.ConditionTrue + terminalCondition.Message = &errorMessage + } else { + // Clear the terminal condition if no longer present + if terminalCondition != nil { + terminalCondition.Status = corev1.ConditionFalse + terminalCondition.Message = nil + } + // Handling Recoverable Conditions + if err != nil { + if recoverableCondition == nil { + // Add a new Condition containing a non-terminal error + recoverableCondition = &ackv1alpha1.Condition{ + Type: ackv1alpha1.ConditionTypeRecoverable, + } + ko.Status.Conditions = append(ko.Status.Conditions, recoverableCondition) + } + recoverableCondition.Status = corev1.ConditionTrue + awsErr, _ := ackerr.AWSError(err) + errorMessage := err.Error() + if awsErr != nil { + errorMessage = awsErr.Error() + } + recoverableCondition.Message = &errorMessage + } else if recoverableCondition != nil { + recoverableCondition.Status = corev1.ConditionFalse + recoverableCondition.Message = nil + } + } + // Required to avoid the "declared but not used" error in the default case + _ = syncCondition + if terminalCondition != nil || recoverableCondition != nil || syncCondition != nil { + return &resource{ko}, true // updated + } + return nil, false // not updated +} + +// terminalAWSError returns awserr, true; if the supplied error is an aws Error type +// and if the exception indicates that it is a Terminal exception +// 'Terminal' exception are specified in generator configuration +func (rm *resourceManager) terminalAWSError(err error) bool { + // No terminal_errors specified for this resource in generator config + return false +} diff --git a/test/e2e/resources/dhcp_options.yaml b/test/e2e/resources/dhcp_options.yaml new file mode 100755 index 00000000..e90b503d --- /dev/null +++ b/test/e2e/resources/dhcp_options.yaml @@ -0,0 +1,13 @@ +apiVersion: ec2.services.k8s.aws/v1alpha1 +kind: DHCPOptions +metadata: + name: $DHCP_OPTIONS_NAME +spec: + dhcpConfigurations: + - key: $DHCP_KEY_1 + values: + - $DHCP_VAL_1 + - key: $DHCP_KEY_2 + values: + - $DHCP_VAL_2_1 + - $DHCP_VAL_2_2 diff --git a/test/e2e/tests/test_dhcp_options.py b/test/e2e/tests/test_dhcp_options.py new file mode 100755 index 00000000..098da813 --- /dev/null +++ b/test/e2e/tests/test_dhcp_options.py @@ -0,0 +1,97 @@ +# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You may +# not use this file except in compliance with the License. A copy of the +# License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is distributed +# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +# express or implied. See the License for the specific language governing +# permissions and limitations under the License. + +"""Integration tests for the DHCPOptions API. +""" + +import pytest +import time +import logging + +from acktest.resources import random_suffix_name +from acktest.k8s import resource as k8s +from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_ec2_resource +from e2e.replacement_values import REPLACEMENT_VALUES + +RESOURCE_PLURAL = "dhcpoptions" + +DEFAULT_WAIT_AFTER_SECONDS = 5 +CREATE_WAIT_AFTER_SECONDS = 10 +DELETE_WAIT_AFTER_SECONDS = 10 + + +def get_dhcp_options(ec2_client, dhcp_options_id: str) -> dict: + try: + resp = ec2_client.describe_dhcp_options( + Filters=[{"Name": "dhcp-options-id", "Values": [dhcp_options_id]}] + ) + except Exception as e: + logging.debug(e) + return None + + if len(resp["DhcpOptions"]) == 0: + return None + return resp["DhcpOptions"][0] + + +def dhcp_options_exist(ec2_client, dhcp_options_id: str) -> bool: + return get_dhcp_options(ec2_client, dhcp_options_id) is not None + +@service_marker +@pytest.mark.canary +class TestDhcpOptions: + def test_create_delete(self, ec2_client): + test_resource_values = REPLACEMENT_VALUES.copy() + resource_name = random_suffix_name("dhcp-opts-test", 24) + + test_resource_values["DHCP_OPTIONS_NAME"] = resource_name + test_resource_values["DHCP_KEY_1"] = "domain-name" + test_resource_values["DHCP_VAL_1"] = "ack-example.com" + test_resource_values["DHCP_KEY_2"] = "domain-name-servers" + test_resource_values["DHCP_VAL_2_1"] = "10.2.5.1" + test_resource_values["DHCP_VAL_2_2"] = "10.2.5.2" + + # Load DHCP Options CR + resource_data = load_ec2_resource( + "dhcp_options", + additional_replacements=test_resource_values, + ) + logging.debug(resource_data) + + # Create k8s resource + ref = k8s.CustomResourceReference( + CRD_GROUP, CRD_VERSION, RESOURCE_PLURAL, + resource_name, namespace="default", + ) + k8s.create_custom_resource(ref, resource_data) + cr = k8s.wait_resource_consumed_by_controller(ref) + + assert cr is not None + assert k8s.get_resource_exists(ref) + + resource = k8s.get_resource(ref) + resource_id = resource["status"]["dhcpOptionsID"] + + time.sleep(CREATE_WAIT_AFTER_SECONDS) + + # Check DHCP Options exists + assert dhcp_options_exist(ec2_client, resource_id) + + # Delete k8s resource + _, deleted = k8s.delete_custom_resource(ref) + assert deleted is True + + time.sleep(DELETE_WAIT_AFTER_SECONDS) + + # Check DHCP Options doesn't exist + assert not dhcp_options_exist(ec2_client, resource_id)