From 9e94f0c578d62eef233aca581fa229f415c33ef1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 14 Feb 2024 03:56:29 +0000 Subject: [PATCH] Update to ACK runtime `v0.30.0`, code-generator `v0.30.0` --- apis/v1alpha1/ack-generate-metadata.yaml | 8 +- apis/v1alpha1/zz_generated.deepcopy.go | 22 +- config/controller/kustomization.yaml | 2 +- ...all.services.k8s.aws_firewallpolicies.yaml | 264 ++++---- ...rkfirewall.services.k8s.aws_firewalls.yaml | 278 ++++---- ...kfirewall.services.k8s.aws_rulegroups.yaml | 597 ++++++++++-------- .../services.k8s.aws_adoptedresources.yaml | 206 +++--- .../bases/services.k8s.aws_fieldexports.yaml | 54 +- config/rbac/cluster-role-controller.yaml | 1 - go.mod | 58 +- go.sum | 158 ++--- helm/Chart.yaml | 4 +- ...all.services.k8s.aws_firewallpolicies.yaml | 264 ++++---- ...rkfirewall.services.k8s.aws_firewalls.yaml | 278 ++++---- ...kfirewall.services.k8s.aws_rulegroups.yaml | 597 ++++++++++-------- .../services.k8s.aws_adoptedresources.yaml | 209 +++--- helm/crds/services.k8s.aws_fieldexports.yaml | 54 +- helm/templates/NOTES.txt | 2 +- helm/templates/_helpers.tpl | 16 +- helm/templates/cluster-role-binding.yaml | 13 +- helm/templates/cluster-role-controller.yaml | 11 +- helm/templates/deployment.yaml | 22 +- .../leader-election-role-binding.yaml | 2 +- helm/templates/metrics-service.yaml | 10 +- helm/templates/service-account.yaml | 8 +- helm/values.yaml | 2 +- 26 files changed, 1720 insertions(+), 1420 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index d1c67a1..abb6ebd 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2024-01-29T18:06:48Z" - build_hash: f7bd096139136c1eb1ec095bbbc19598c8543980 - go_version: go1.21.5 - version: v0.29.2-1-gf7bd096 + build_date: "2024-02-14T03:52:56Z" + build_hash: 947081ffebdeefcf2c61c4ca6d7e68810bdf9d08 + go_version: go1.22.0 + version: v0.30.0 api_directory_checksum: d1e658b3ba065d698f44f7c46b861c7b5ffb85e1 api_version: v1alpha1 aws_sdk_go_version: v1.49.0 diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 582c94e..1e98baf 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // @@ -152,7 +151,8 @@ func (in *CIDRSummary) DeepCopyInto(out *CIDRSummary) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(IPSetMetadata) (*in).DeepCopyInto(*out) } @@ -836,7 +836,8 @@ func (in *FirewallStatus_SDK) DeepCopyInto(out *FirewallStatus_SDK) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(SyncState) (*in).DeepCopyInto(*out) } @@ -1170,7 +1171,8 @@ func (in *PolicyVariables) DeepCopyInto(out *PolicyVariables) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(IPSet) (*in).DeepCopyInto(*out) } @@ -1277,7 +1279,8 @@ func (in *ReferenceSets) DeepCopyInto(out *ReferenceSets) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(IPSetReference) (*in).DeepCopyInto(*out) } @@ -1706,7 +1709,8 @@ func (in *RuleVariables) DeepCopyInto(out *RuleVariables) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(IPSet) (*in).DeepCopyInto(*out) } @@ -1721,7 +1725,8 @@ func (in *RuleVariables) DeepCopyInto(out *RuleVariables) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(PortSet) (*in).DeepCopyInto(*out) } @@ -2217,7 +2222,8 @@ func (in *SyncState) DeepCopyInto(out *SyncState) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(PerObjectStatus) (*in).DeepCopyInto(*out) } diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 8c19fb0..c89a45d 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/networkfirewall-controller - newTag: 0.0.1 + newTag: 0.0.2 diff --git a/config/crd/bases/networkfirewall.services.k8s.aws_firewallpolicies.yaml b/config/crd/bases/networkfirewall.services.k8s.aws_firewallpolicies.yaml index 654ded4..5602719 100644 --- a/config/crd/bases/networkfirewall.services.k8s.aws_firewallpolicies.yaml +++ b/config/crd/bases/networkfirewall.services.k8s.aws_firewallpolicies.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: firewallpolicies.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,31 +20,42 @@ spec: description: FirewallPolicy is the Schema for the FirewallPolicies 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' + 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' + 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: "FirewallPolicySpec defines the desired state of FirewallPolicy. - \n The firewall policy defines the behavior of a firewall using a collection - of stateless and stateful rule groups and other settings. You can use - one firewall policy for multiple firewalls. \n This, along with FirewallPolicyResponse, - define the policy. You can retrieve all objects for a firewall policy - by calling DescribeFirewallPolicy." + description: |- + FirewallPolicySpec defines the desired state of FirewallPolicy. + + + The firewall policy defines the behavior of a firewall using a collection + of stateless and stateful rule groups and other settings. You can use one + firewall policy for multiple firewalls. + + + This, along with FirewallPolicyResponse, define the policy. You can retrieve + all objects for a firewall policy by calling DescribeFirewallPolicy. properties: description: description: A description of the firewall policy. type: string encryptionConfiguration: - description: A complex type that contains settings for encryption - of your firewall policy resources. + description: |- + A complex type that contains settings for encryption of your firewall policy + resources. properties: keyID: type: string @@ -57,13 +67,15 @@ spec: policy. properties: policyVariables: - description: Contains variables that you can use to override default - Suricata settings in your firewall policy. + description: |- + Contains variables that you can use to override default Suricata settings + in your firewall policy. properties: ruleVariables: additionalProperties: - description: A list of IP addresses and address ranges, - in CIDR notation. This is part of a RuleVariables. + description: |- + A list of IP addresses and address ranges, in CIDR notation. This is part + of a RuleVariables. properties: definition: items: @@ -77,8 +89,9 @@ spec: type: string type: array statefulEngineOptions: - description: Configuration settings for the handling of the stateful - rule groups in a firewall policy. + description: |- + Configuration settings for the handling of the stateful rule groups in a + firewall policy. properties: ruleOrder: type: string @@ -87,12 +100,14 @@ spec: type: object statefulRuleGroupReferences: items: - description: Identifier for a single stateful rule group, used - in a firewall policy to refer to a rule group. + description: |- + Identifier for a single stateful rule group, used in a firewall policy to + refer to a rule group. properties: override: - description: The setting that allows the policy owner to - change the behavior of the rule group within a policy. + description: |- + The setting that allows the policy owner to change the behavior of the rule + group within a policy. properties: action: type: string @@ -106,44 +121,56 @@ spec: type: array statelessCustomActions: items: - description: "An optional, non-standard action to use for stateless - packet handling. You can define this in addition to the standard - action that you must specify. \n You define and name the custom - actions that you want to be able to use, and then you reference - them by name in your actions settings. \n You can use custom - actions in the following places: \n * In a rule group's StatelessRulesAndCustomActions - specification. The custom actions are available for use by - name inside the StatelessRulesAndCustomActions where you define - them. You can use them for your stateless rule actions to - specify what to do with a packet that matches the rule's match - attributes. \n * In a FirewallPolicy specification, in StatelessCustomActions. - The custom actions are available for use inside the policy - where you define them. You can use them for the policy's default - stateless actions settings to specify what to do with packets - that don't match any of the policy's stateless rules." + description: |- + An optional, non-standard action to use for stateless packet handling. You + can define this in addition to the standard action that you must specify. + + + You define and name the custom actions that you want to be able to use, and + then you reference them by name in your actions settings. + + + You can use custom actions in the following places: + + + * In a rule group's StatelessRulesAndCustomActions specification. The + custom actions are available for use by name inside the StatelessRulesAndCustomActions + where you define them. You can use them for your stateless rule actions + to specify what to do with a packet that matches the rule's match attributes. + + + * In a FirewallPolicy specification, in StatelessCustomActions. The custom + actions are available for use inside the policy where you define them. + You can use them for the policy's default stateless actions settings to + specify what to do with packets that don't match any of the policy's stateless + rules. properties: actionDefinition: - description: A custom action to use in stateless rule actions - settings. This is used in CustomAction. + description: |- + A custom action to use in stateless rule actions settings. This is used in + CustomAction. properties: publishMetricAction: - description: Stateless inspection criteria that publishes - the specified metrics to Amazon CloudWatch for the - matching packet. This setting defines a CloudWatch - dimension value to be published. + description: |- + Stateless inspection criteria that publishes the specified metrics to Amazon + CloudWatch for the matching packet. This setting defines a CloudWatch dimension + value to be published. properties: dimensions: items: - description: "The value to use in an Amazon CloudWatch - custom metric dimension. This is used in the - PublishMetrics CustomAction. A CloudWatch custom - metric dimension is a name/value pair that's - part of the identity of a metric. \n Network - Firewall sets the dimension name to CustomAction - and you provide the dimension value. \n For - more information about CloudWatch custom metric - dimensions, see Publishing Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) - in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html)." + description: |- + The value to use in an Amazon CloudWatch custom metric dimension. This is + used in the PublishMetrics CustomAction. A CloudWatch custom metric dimension + is a name/value pair that's part of the identity of a metric. + + + Network Firewall sets the dimension name to CustomAction and you provide + the dimension value. + + + For more information about CloudWatch custom metric dimensions, see Publishing + Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) + in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html). properties: value: type: string @@ -165,8 +192,9 @@ spec: type: array statelessRuleGroupReferences: items: - description: Identifier for a single stateless rule group, used - in a firewall policy to refer to the rule group. + description: |- + Identifier for a single stateless rule group, used in a firewall policy to + refer to the rule group. properties: priority: format: int64 @@ -179,17 +207,18 @@ spec: type: string type: object firewallPolicyName: - description: The descriptive name of the firewall policy. You can't - change the name of a firewall policy after you create it. + description: |- + The descriptive name of the firewall policy. You can't change the name of + a firewall policy after you create it. type: string tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -206,24 +235,26 @@ spec: description: FirewallPolicyStatus defines the observed state of FirewallPolicy properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -234,14 +265,16 @@ spec: - region 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 + 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 + 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 @@ -267,9 +300,10 @@ spec: type: object type: array firewallPolicyResponse: - description: The high-level properties of a firewall policy. This, - along with the FirewallPolicy, define the policy. You can retrieve - all objects for a firewall policy by calling DescribeFirewallPolicy. + description: |- + The high-level properties of a firewall policy. This, along with the FirewallPolicy, + define the policy. You can retrieve all objects for a firewall policy by + calling DescribeFirewallPolicy. properties: consumedStatefulRuleCapacity: format: int64 @@ -280,15 +314,14 @@ spec: description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -312,13 +345,12 @@ spec: type: integer tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -328,16 +360,18 @@ spec: type: array type: object updateToken: - description: "A token used for optimistic locking. Network Firewall - returns a token to your requests that access the firewall policy. - The token marks the state of the policy resource at the time of - the request. \n To make changes to the policy, you provide the token - in your request. Network Firewall uses the token to ensure that - the policy hasn't changed since you last retrieved it. If it has - changed, the operation fails with an InvalidTokenException. If this - happens, retrieve the firewall policy again to get a current copy - of it with current token. Reapply your changes as needed, then try - the operation again using the new token." + description: |- + A token used for optimistic locking. Network Firewall returns a token to + your requests that access the firewall policy. The token marks the state + of the policy resource at the time of the request. + + + To make changes to the policy, you provide the token in your request. Network + Firewall uses the token to ensure that the policy hasn't changed since you + last retrieved it. If it has changed, the operation fails with an InvalidTokenException. + If this happens, retrieve the firewall policy again to get a current copy + of it with current token. Reapply your changes as needed, then try the operation + again using the new token. type: string type: object type: object diff --git a/config/crd/bases/networkfirewall.services.k8s.aws_firewalls.yaml b/config/crd/bases/networkfirewall.services.k8s.aws_firewalls.yaml index 96748d7..c8f2312 100644 --- a/config/crd/bases/networkfirewall.services.k8s.aws_firewalls.yaml +++ b/config/crd/bases/networkfirewall.services.k8s.aws_firewalls.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: firewalls.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,33 +20,43 @@ spec: description: Firewall is the Schema for the Firewalls 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' + 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' + 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: "FirewallSpec defines the desired state of Firewall. \n The - firewall defines the configuration settings for an Network Firewall - firewall. These settings include the firewall policy, the subnets in - your VPC to use for the firewall endpoints, and any tags that are attached - to the firewall Amazon Web Services resource. \n The status of the firewall, - for example whether it's ready to filter network traffic, is provided - in the corresponding FirewallStatus. You can retrieve both objects by - calling DescribeFirewall." + description: |- + FirewallSpec defines the desired state of Firewall. + + + The firewall defines the configuration settings for an Network Firewall firewall. + These settings include the firewall policy, the subnets in your VPC to use + for the firewall endpoints, and any tags that are attached to the firewall + Amazon Web Services resource. + + + The status of the firewall, for example whether it's ready to filter network + traffic, is provided in the corresponding FirewallStatus. You can retrieve + both objects by calling DescribeFirewall. properties: deleteProtection: - description: A flag indicating whether it is possible to delete the - firewall. A setting of TRUE indicates that the firewall is protected - against deletion. Use this setting to protect against accidentally - deleting a firewall that is in use. When you create a firewall, - the operation initializes this flag to TRUE. + description: |- + A flag indicating whether it is possible to delete the firewall. A setting + of TRUE indicates that the firewall is protected against deletion. Use this + setting to protect against accidentally deleting a firewall that is in use. + When you create a firewall, the operation initializes this flag to TRUE. type: boolean description: description: A description of the firewall. @@ -62,37 +71,40 @@ spec: type: string type: object firewallName: - description: The descriptive name of the firewall. You can't change - the name of a firewall after you create it. + description: |- + The descriptive name of the firewall. You can't change the name of a firewall + after you create it. type: string firewallPolicyARN: - description: The Amazon Resource Name (ARN) of the FirewallPolicy - that you want to use for the firewall. + description: |- + The Amazon Resource Name (ARN) of the FirewallPolicy that you want to use + for the firewall. type: string firewallPolicyChangeProtection: - description: A setting indicating whether the firewall is protected - against a change to the firewall policy association. Use this setting - to protect against accidentally modifying the firewall policy for - a firewall that is in use. When you create a firewall, the operation - initializes this setting to TRUE. + description: |- + A setting indicating whether the firewall is protected against a change to + the firewall policy association. Use this setting to protect against accidentally + modifying the firewall policy for a firewall that is in use. When you create + a firewall, the operation initializes this setting to TRUE. type: boolean subnetChangeProtection: - description: A setting indicating whether the firewall is protected - against changes to the subnet associations. Use this setting to - protect against accidentally modifying the subnet associations for - a firewall that is in use. When you create a firewall, the operation - initializes this setting to TRUE. + description: |- + A setting indicating whether the firewall is protected against changes to + the subnet associations. Use this setting to protect against accidentally + modifying the subnet associations for a firewall that is in use. When you + create a firewall, the operation initializes this setting to TRUE. type: boolean subnetMappings: - description: The public subnets to use for your Network Firewall firewalls. - Each subnet must belong to a different Availability Zone in the - VPC. Network Firewall creates a firewall endpoint in each subnet. + description: |- + The public subnets to use for your Network Firewall firewalls. Each subnet + must belong to a different Availability Zone in the VPC. Network Firewall + creates a firewall endpoint in each subnet. items: - description: The ID for a subnet that you want to associate with - the firewall. This is used with CreateFirewall and AssociateSubnets. - Network Firewall creates an instance of the associated firewall - in each subnet that you specify, to filter traffic in the subnet's - Availability Zone. + description: |- + The ID for a subnet that you want to associate with the firewall. This is + used with CreateFirewall and AssociateSubnets. Network Firewall creates an + instance of the associated firewall in each subnet that you specify, to filter + traffic in the subnet's Availability Zone. properties: iPAddressType: type: string @@ -103,11 +115,11 @@ spec: tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -117,9 +129,12 @@ spec: type: object type: array vpcID: - description: "The unique identifier of the VPC where Network Firewall - should create the firewall. \n You can't change this setting after - you create the firewall." + description: |- + The unique identifier of the VPC where Network Firewall should create the + firewall. + + + You can't change this setting after you create the firewall. type: string required: - firewallName @@ -131,24 +146,26 @@ spec: description: FirewallStatus defines the observed state of Firewall properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -159,14 +176,16 @@ spec: - region 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 + 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 + 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 @@ -192,24 +211,23 @@ spec: type: object type: array firewall: - description: The configuration settings for the firewall. These settings - include the firewall policy and the subnets in your VPC to use for - the firewall endpoints. + description: |- + The configuration settings for the firewall. These settings include the firewall + policy and the subnets in your VPC to use for the firewall endpoints. properties: deleteProtection: type: boolean description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -231,11 +249,11 @@ spec: type: boolean subnetMappings: items: - description: The ID for a subnet that you want to associate - with the firewall. This is used with CreateFirewall and AssociateSubnets. - Network Firewall creates an instance of the associated firewall - in each subnet that you specify, to filter traffic in the - subnet's Availability Zone. + description: |- + The ID for a subnet that you want to associate with the firewall. This is + used with CreateFirewall and AssociateSubnets. Network Firewall creates an + instance of the associated firewall in each subnet that you specify, to filter + traffic in the subnet's Availability Zone. properties: iPAddressType: type: string @@ -245,13 +263,12 @@ spec: type: array tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -263,19 +280,21 @@ spec: type: string type: object firewallStatus: - description: Detailed information about the current status of a Firewall. - You can retrieve this for a firewall by calling DescribeFirewall - and providing the firewall name and ARN. + description: |- + Detailed information about the current status of a Firewall. You can retrieve + this for a firewall by calling DescribeFirewall and providing the firewall + name and ARN. properties: capacityUsageSummary: - description: The capacity usage summary of the resources used - by the ReferenceSets in a firewall. + description: |- + The capacity usage summary of the resources used by the ReferenceSets in + a firewall. properties: cidrs: - description: Summarizes the CIDR blocks used by the IP set - references in a firewall. Network Firewall calculates the - number of CIDRs by taking an aggregated count of all CIDRs - used by the IP sets you are referencing. + description: |- + Summarizes the CIDR blocks used by the IP set references in a firewall. Network + Firewall calculates the number of CIDRs by taking an aggregated count of + all CIDRs used by the IP sets you are referencing. properties: availableCIDRCount: format: int64 @@ -300,22 +319,30 @@ spec: type: string syncStates: additionalProperties: - description: "The status of the firewall endpoint and firewall - policy configuration for a single VPC subnet. \n For each - VPC subnet that you associate with a firewall, Network Firewall - does the following: \n * Instantiates a firewall endpoint - in the subnet, ready to take traffic. \n * Configures the - endpoint with the current firewall policy settings, to provide - the filtering behavior for the endpoint. \n When you update - a firewall, for example to add a subnet association or change - a rule group in the firewall policy, the affected sync states - reflect out-of-sync or not ready status until the changes - are complete." + description: |- + The status of the firewall endpoint and firewall policy configuration for + a single VPC subnet. + + + For each VPC subnet that you associate with a firewall, Network Firewall + does the following: + + + * Instantiates a firewall endpoint in the subnet, ready to take traffic. + + + * Configures the endpoint with the current firewall policy settings, to + provide the filtering behavior for the endpoint. + + + When you update a firewall, for example to add a subnet association or change + a rule group in the firewall policy, the affected sync states reflect out-of-sync + or not ready status until the changes are complete. properties: attachment: - description: The configuration and status for a single subnet - that you've specified for use by the Network Firewall - firewall. This is part of the FirewallStatus. + description: |- + The configuration and status for a single subnet that you've specified for + use by the Network Firewall firewall. This is part of the FirewallStatus. properties: endpointID: type: string @@ -328,14 +355,13 @@ spec: type: object config: additionalProperties: - description: Provides configuration status for a single - policy or rule group that is used for a firewall endpoint. - Network Firewall provides each endpoint with the rules - that are configured in the firewall policy. Each time - you add a subnet or modify the associated firewall policy, - Network Firewall synchronizes the rules in the endpoint, - so it can properly filter network traffic. This is part - of a SyncState for a firewall. + description: |- + Provides configuration status for a single policy or rule group that is used + for a firewall endpoint. Network Firewall provides each endpoint with the + rules that are configured in the firewall policy. Each time you add a subnet + or modify the associated firewall policy, Network Firewall synchronizes the + rules in the endpoint, so it can properly filter network traffic. This is + part of a SyncState for a firewall. properties: syncStatus: type: string diff --git a/config/crd/bases/networkfirewall.services.k8s.aws_rulegroups.yaml b/config/crd/bases/networkfirewall.services.k8s.aws_rulegroups.yaml index 5ba274a..305d2af 100644 --- a/config/crd/bases/networkfirewall.services.k8s.aws_rulegroups.yaml +++ b/config/crd/bases/networkfirewall.services.k8s.aws_rulegroups.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: rulegroups.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,82 +20,123 @@ spec: description: RuleGroup is the Schema for the RuleGroups 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' + 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' + 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: "RuleGroupSpec defines the desired state of RuleGroup. \n - The object that defines the rules in a rule group. This, along with - RuleGroupResponse, define the rule group. You can retrieve all objects - for a rule group by calling DescribeRuleGroup. \n Network Firewall uses - a rule group to inspect and control network traffic. You define stateless - rule groups to inspect individual packets and you define stateful rule - groups to inspect packets in the context of their traffic flow. \n To - use a rule group, you include it by reference in an Network Firewall - firewall policy, then you use the policy in a firewall. You can reference - a rule group from more than one firewall policy, and you can use a firewall - policy in more than one firewall." + description: |- + RuleGroupSpec defines the desired state of RuleGroup. + + + The object that defines the rules in a rule group. This, along with RuleGroupResponse, + define the rule group. You can retrieve all objects for a rule group by calling + DescribeRuleGroup. + + + Network Firewall uses a rule group to inspect and control network traffic. + You define stateless rule groups to inspect individual packets and you define + stateful rule groups to inspect packets in the context of their traffic flow. + + + To use a rule group, you include it by reference in an Network Firewall firewall + policy, then you use the policy in a firewall. You can reference a rule group + from more than one firewall policy, and you can use a firewall policy in + more than one firewall. properties: analyzeRuleGroup: - description: Indicates whether you want Network Firewall to analyze - the stateless rules in the rule group for rule behavior such as - asymmetric routing. If set to TRUE, Network Firewall runs the analysis - and then creates the rule group for you. To run the stateless rule - group analyzer without creating the rule group, set DryRun to TRUE. + description: |- + Indicates whether you want Network Firewall to analyze the stateless rules + in the rule group for rule behavior such as asymmetric routing. If set to + TRUE, Network Firewall runs the analysis and then creates the rule group + for you. To run the stateless rule group analyzer without creating the rule + group, set DryRun to TRUE. type: boolean capacity: - description: "The maximum operating resources that this rule group - can use. Rule group capacity is fixed at creation. When you update - a rule group, you are limited to this capacity. When you reference - a rule group from a firewall policy, Network Firewall reserves this - capacity for the rule group. \n You can retrieve the capacity that - would be required for a rule group before you create the rule group - by calling CreateRuleGroup with DryRun set to TRUE. \n You can't - change or exceed this capacity when you update the rule group, so - leave room for your rule group to grow. \n Capacity for a stateless - rule group \n For a stateless rule group, the capacity required - is the sum of the capacity requirements of the individual rules - that you expect to have in the rule group. \n To calculate the capacity - requirement of a single rule, multiply the capacity requirement - values of each of the rule's match settings: \n * A match setting - with no criteria specified has a value of 1. \n * A match setting - with Any specified has a value of 1. \n * All other match settings - have a value equal to the number of elements provided in the setting. - For example, a protocol setting [\"UDP\"] and a source setting [\"10.0.0.0/24\"] - each have a value of 1. A protocol setting [\"UDP\",\"TCP\"] has - a value of 2. A source setting [\"10.0.0.0/24\",\"10.0.0.1/24\",\"10.0.0.2/24\"] - has a value of 3. \n A rule with no criteria specified in any of - its match settings has a capacity requirement of 1. A rule with - protocol setting [\"UDP\",\"TCP\"], source setting [\"10.0.0.0/24\",\"10.0.0.1/24\",\"10.0.0.2/24\"], - and a single specification or no specification for each of the other - match settings has a capacity requirement of 6. \n Capacity for - a stateful rule group \n For a stateful rule group, the minimum - capacity required is the number of individual rules that you expect - to have in the rule group." + description: |- + The maximum operating resources that this rule group can use. Rule group + capacity is fixed at creation. When you update a rule group, you are limited + to this capacity. When you reference a rule group from a firewall policy, + Network Firewall reserves this capacity for the rule group. + + + You can retrieve the capacity that would be required for a rule group before + you create the rule group by calling CreateRuleGroup with DryRun set to TRUE. + + + You can't change or exceed this capacity when you update the rule group, + so leave room for your rule group to grow. + + + Capacity for a stateless rule group + + + For a stateless rule group, the capacity required is the sum of the capacity + requirements of the individual rules that you expect to have in the rule + group. + + + To calculate the capacity requirement of a single rule, multiply the capacity + requirement values of each of the rule's match settings: + + + * A match setting with no criteria specified has a value of 1. + + + * A match setting with Any specified has a value of 1. + + + * All other match settings have a value equal to the number of elements + provided in the setting. For example, a protocol setting ["UDP"] and a + source setting ["10.0.0.0/24"] each have a value of 1. A protocol setting + ["UDP","TCP"] has a value of 2. A source setting ["10.0.0.0/24","10.0.0.1/24","10.0.0.2/24"] + has a value of 3. + + + A rule with no criteria specified in any of its match settings has a capacity + requirement of 1. A rule with protocol setting ["UDP","TCP"], source setting + ["10.0.0.0/24","10.0.0.1/24","10.0.0.2/24"], and a single specification or + no specification for each of the other match settings has a capacity requirement + of 6. + + + Capacity for a stateful rule group + + + For a stateful rule group, the minimum capacity required is the number of + individual rules that you expect to have in the rule group. format: int64 type: integer description: description: A description of the rule group. type: string dryRun: - description: "Indicates whether you want Network Firewall to just - check the validity of the request, rather than run the request. - \n If set to TRUE, Network Firewall checks whether the request can - run successfully, but doesn't actually make the requested changes. - The call returns the value that the request would return if you - ran it with dry run set to FALSE, but doesn't make additions or - changes to your resources. This option allows you to make sure that - you have the required permissions to run the request and that your - request parameters are valid. \n If set to FALSE, Network Firewall - makes the requested changes to your resources." + description: |- + Indicates whether you want Network Firewall to just check the validity of + the request, rather than run the request. + + + If set to TRUE, Network Firewall checks whether the request can run successfully, + but doesn't actually make the requested changes. The call returns the value + that the request would return if you ran it with dry run set to FALSE, but + doesn't make additions or changes to your resources. This option allows you + to make sure that you have the required permissions to run the request and + that your request parameters are valid. + + + If set to FALSE, Network Firewall makes the requested changes to your resources. type: boolean encryptionConfiguration: description: A complex type that contains settings for encryption @@ -108,31 +148,34 @@ spec: type: string type: object ruleGroup: - description: "An object that defines the rule group rules. \n You - must provide either this rule group setting or a Rules setting, - but not both." + description: |- + An object that defines the rule group rules. + + + You must provide either this rule group setting or a Rules setting, but not + both. properties: referenceSets: description: Contains a set of IP set references. properties: iPSetReferences: additionalProperties: - description: "Configures one or more IP set references for - a Suricata-compatible rule group. This is used in CreateRuleGroup - or UpdateRuleGroup. An IP set reference is a rule variable - that references resources that you create and manage in - another Amazon Web Services service, such as an Amazon - VPC prefix list. Network Firewall IP set references enable - you to dynamically update the contents of your rules. - When you create, update, or delete the resource you are - referencing in your rule, Network Firewall automatically - updates the rule's content with the changes. For more - information about IP set references in Network Firewall, + description: |- + Configures one or more IP set references for a Suricata-compatible rule group. + This is used in CreateRuleGroup or UpdateRuleGroup. An IP set reference is + a rule variable that references resources that you create and manage in another + Amazon Web Services service, such as an Amazon VPC prefix list. Network Firewall + IP set references enable you to dynamically update the contents of your rules. + When you create, update, or delete the resource you are referencing in your + rule, Network Firewall automatically updates the rule's content with the + changes. For more information about IP set references in Network Firewall, see Using IP set references (https://docs.aws.amazon.com/network-firewall/latest/developerguide/rule-groups-ip-set-references) - in the Network Firewall Developer Guide. \n Network Firewall - currently supports Amazon VPC prefix lists (https://docs.aws.amazon.com/vpc/latest/userguide/managed-prefix-lists.html) + in the Network Firewall Developer Guide. + + + Network Firewall currently supports Amazon VPC prefix lists (https://docs.aws.amazon.com/vpc/latest/userguide/managed-prefix-lists.html) and resource groups (https://docs.aws.amazon.com/network-firewall/latest/developerguide/rule-groups-ip-set-references.html#rule-groups-referencing-resource-groups) - in IP set references." + in IP set references. properties: referenceARN: type: string @@ -140,13 +183,15 @@ spec: type: object type: object ruleVariables: - description: Settings that are available for use in the rules - in the RuleGroup where this is defined. + description: |- + Settings that are available for use in the rules in the RuleGroup where this + is defined. properties: iPSets: additionalProperties: - description: A list of IP addresses and address ranges, - in CIDR notation. This is part of a RuleVariables. + description: |- + A list of IP addresses and address ranges, in CIDR notation. This is part + of a RuleVariables. properties: definition: items: @@ -167,24 +212,27 @@ spec: type: object type: object rulesSource: - description: The stateless or stateful rules definitions for use - in a single rule group. Each rule group requires a single RulesSource. - You can use an instance of this for either stateless rules or - stateful rules. + description: |- + The stateless or stateful rules definitions for use in a single rule group. + Each rule group requires a single RulesSource. You can use an instance of + this for either stateless rules or stateful rules. properties: rulesSourceList: - description: "Stateful inspection criteria for a domain list - rule group. \n For HTTPS traffic, domain filtering is SNI-based. - It uses the server name indicator extension of the TLS handshake. - \n By default, Network Firewall domain list inspection only - includes traffic coming from the VPC where you deploy the - firewall. To inspect traffic from IP addresses outside of - the deployment VPC, you set the HOME_NET rule variable to - include the CIDR range of the deployment VPC plus the other - CIDR ranges. For more information, see RuleVariables in - this guide and Stateful domain list rule groups in Network - Firewall (https://docs.aws.amazon.com/network-firewall/latest/developerguide/stateful-rule-groups-domain-names.html) - in the Network Firewall Developer Guide." + description: |- + Stateful inspection criteria for a domain list rule group. + + + For HTTPS traffic, domain filtering is SNI-based. It uses the server name + indicator extension of the TLS handshake. + + + By default, Network Firewall domain list inspection only includes traffic + coming from the VPC where you deploy the firewall. To inspect traffic from + IP addresses outside of the deployment VPC, you set the HOME_NET rule variable + to include the CIDR range of the deployment VPC plus the other CIDR ranges. + For more information, see RuleVariables in this guide and Stateful domain + list rule groups in Network Firewall (https://docs.aws.amazon.com/network-firewall/latest/developerguide/stateful-rule-groups-domain-names.html) + in the Network Firewall Developer Guide. properties: generatedRulesType: type: string @@ -201,18 +249,18 @@ spec: type: string statefulRules: items: - description: A single Suricata rules specification, for - use in a stateful rule group. Use this option to specify - a simple Suricata rule with protocol, source and destination, - ports, direction, and rule options. For information about - the Suricata Rules format, see Rules Format (https://suricata.readthedocs.io/en/suricata-6.0.9/rules/intro.html). + description: |- + A single Suricata rules specification, for use in a stateful rule group. + Use this option to specify a simple Suricata rule with protocol, source and + destination, ports, direction, and rule options. For information about the + Suricata Rules format, see Rules Format (https://suricata.readthedocs.io/en/suricata-6.0.9/rules/intro.html). properties: action: type: string header: - description: The basic rule criteria for Network Firewall - to use to inspect packet headers in stateful traffic - flow inspection. Traffic flows that match the criteria + description: |- + The basic rule criteria for Network Firewall to use to inspect packet headers + in stateful traffic flow inspection. Traffic flows that match the criteria are a match for the corresponding StatefulRule. properties: destination: @@ -230,8 +278,9 @@ spec: type: object ruleOptions: items: - description: Additional settings for a stateful rule. - This is part of the StatefulRule configuration. + description: |- + Additional settings for a stateful rule. This is part of the StatefulRule + configuration. properties: keyword: type: string @@ -244,58 +293,62 @@ spec: type: object type: array statelessRulesAndCustomActions: - description: Stateless inspection criteria. Each stateless - rule group uses exactly one of these data types to define - its stateless rules. + description: |- + Stateless inspection criteria. Each stateless rule group uses exactly one + of these data types to define its stateless rules. properties: customActions: items: - description: "An optional, non-standard action to use - for stateless packet handling. You can define this - in addition to the standard action that you must specify. - \n You define and name the custom actions that you - want to be able to use, and then you reference them - by name in your actions settings. \n You can use custom - actions in the following places: \n * In a rule group's - StatelessRulesAndCustomActions specification. The - custom actions are available for use by name inside - the StatelessRulesAndCustomActions where you define - them. You can use them for your stateless rule actions - to specify what to do with a packet that matches the - rule's match attributes. \n * In a FirewallPolicy - specification, in StatelessCustomActions. The custom - actions are available for use inside the policy where - you define them. You can use them for the policy's - default stateless actions settings to specify what - to do with packets that don't match any of the policy's - stateless rules." + description: |- + An optional, non-standard action to use for stateless packet handling. You + can define this in addition to the standard action that you must specify. + + + You define and name the custom actions that you want to be able to use, and + then you reference them by name in your actions settings. + + + You can use custom actions in the following places: + + + * In a rule group's StatelessRulesAndCustomActions specification. The + custom actions are available for use by name inside the StatelessRulesAndCustomActions + where you define them. You can use them for your stateless rule actions + to specify what to do with a packet that matches the rule's match attributes. + + + * In a FirewallPolicy specification, in StatelessCustomActions. The custom + actions are available for use inside the policy where you define them. + You can use them for the policy's default stateless actions settings to + specify what to do with packets that don't match any of the policy's stateless + rules. properties: actionDefinition: - description: A custom action to use in stateless - rule actions settings. This is used in CustomAction. + description: |- + A custom action to use in stateless rule actions settings. This is used in + CustomAction. properties: publishMetricAction: - description: Stateless inspection criteria that - publishes the specified metrics to Amazon - CloudWatch for the matching packet. This setting - defines a CloudWatch dimension value to be - published. + description: |- + Stateless inspection criteria that publishes the specified metrics to Amazon + CloudWatch for the matching packet. This setting defines a CloudWatch dimension + value to be published. properties: dimensions: items: - description: "The value to use in an Amazon - CloudWatch custom metric dimension. - This is used in the PublishMetrics CustomAction. - A CloudWatch custom metric dimension - is a name/value pair that's part of - the identity of a metric. \n Network - Firewall sets the dimension name to - CustomAction and you provide the dimension - value. \n For more information about - CloudWatch custom metric dimensions, - see Publishing Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) - in the Amazon CloudWatch User Guide - (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html)." + description: |- + The value to use in an Amazon CloudWatch custom metric dimension. This is + used in the PublishMetrics CustomAction. A CloudWatch custom metric dimension + is a name/value pair that's part of the identity of a metric. + + + Network Firewall sets the dimension name to CustomAction and you provide + the dimension value. + + + For more information about CloudWatch custom metric dimensions, see Publishing + Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) + in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html). properties: value: type: string @@ -316,31 +369,27 @@ spec: format: int64 type: integer ruleDefinition: - description: The inspection criteria and action - for a single stateless rule. Network Firewall - inspects each packet for the specified matching - criteria. When a packet matches the criteria, - Network Firewall performs the rule's actions on - the packet. + description: |- + The inspection criteria and action for a single stateless rule. Network Firewall + inspects each packet for the specified matching criteria. When a packet matches + the criteria, Network Firewall performs the rule's actions on the packet. properties: actions: items: type: string type: array matchAttributes: - description: Criteria for Network Firewall to - use to inspect an individual packet in stateless - rule inspection. Each match attributes set - can include one or more items such as IP address, - CIDR range, port number, protocol, and TCP - flags. + description: |- + Criteria for Network Firewall to use to inspect an individual packet in stateless + rule inspection. Each match attributes set can include one or more items + such as IP address, CIDR range, port number, protocol, and TCP flags. properties: destinationPorts: items: - description: A single port range specification. - This is used for source and destination - port ranges in the stateless rule MatchAttributes, - SourcePorts, and DestinationPorts settings. + description: |- + A single port range specification. This is used for source and destination + port ranges in the stateless rule MatchAttributes, SourcePorts, and DestinationPorts + settings. properties: fromPort: format: int64 @@ -352,9 +401,9 @@ spec: type: array destinations: items: - description: A single IP address specification. - This is used in the MatchAttributes - source and destination specifications. + description: |- + A single IP address specification. This is used in the MatchAttributes source + and destination specifications. properties: addressDefinition: type: string @@ -367,10 +416,10 @@ spec: type: array sourcePorts: items: - description: A single port range specification. - This is used for source and destination - port ranges in the stateless rule MatchAttributes, - SourcePorts, and DestinationPorts settings. + description: |- + A single port range specification. This is used for source and destination + port ranges in the stateless rule MatchAttributes, SourcePorts, and DestinationPorts + settings. properties: fromPort: format: int64 @@ -382,9 +431,9 @@ spec: type: array sources: items: - description: A single IP address specification. - This is used in the MatchAttributes - source and destination specifications. + description: |- + A single IP address specification. This is used in the MatchAttributes source + and destination specifications. properties: addressDefinition: type: string @@ -392,9 +441,9 @@ spec: type: array tcpFlags: items: - description: TCP flags and masks to inspect - packets for, used in stateless rules - MatchAttributes settings. + description: |- + TCP flags and masks to inspect packets for, used in stateless rules MatchAttributes + settings. properties: flags: items: @@ -413,32 +462,40 @@ spec: type: object type: object statefulRuleOptions: - description: Additional options governing how Network Firewall - handles the rule group. You can only use these for stateful - rule groups. + description: |- + Additional options governing how Network Firewall handles the rule group. + You can only use these for stateful rule groups. properties: ruleOrder: type: string type: object type: object ruleGroupName: - description: The descriptive name of the rule group. You can't change - the name of a rule group after you create it. + description: |- + The descriptive name of the rule group. You can't change the name of a rule + group after you create it. type: string rules: - description: "A string containing stateful rule group rules specifications - in Suricata flat format, with one rule per line. Use this to import - your existing Suricata compatible rule groups. \n You must provide - either this rules setting or a populated RuleGroup setting, but - not both. \n You can provide your rule group specification in Suricata - flat format through this setting when you create or update your - rule group. The call response returns a RuleGroup object that Network - Firewall has populated from your string." + description: |- + A string containing stateful rule group rules specifications in Suricata + flat format, with one rule per line. Use this to import your existing Suricata + compatible rule groups. + + + You must provide either this rules setting or a populated RuleGroup setting, + but not both. + + + You can provide your rule group specification in Suricata flat format through + this setting when you create or update your rule group. The call response + returns a RuleGroup object that Network Firewall has populated from your + string. type: string sourceMetadata: - description: A complex type that contains metadata about the rule - group that your own rule group is copied from. You can use the metadata - to keep track of updates made to the originating rule group. + description: |- + A complex type that contains metadata about the rule group that your own + rule group is copied from. You can use the metadata to keep track of updates + made to the originating rule group. properties: sourceARN: type: string @@ -448,11 +505,11 @@ spec: tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -462,9 +519,10 @@ spec: type: object type: array type_: - description: Indicates whether the rule group is stateless or stateful. - If the rule group is stateless, it contains stateless rules. If - it is stateful, it contains stateful rules. + description: |- + Indicates whether the rule group is stateless or stateful. If the rule group + is stateless, it contains stateless rules. If it is stateful, it contains + stateful rules. type: string required: - capacity @@ -475,24 +533,26 @@ spec: description: RuleGroupStatus defines the observed state of RuleGroup properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -503,14 +563,16 @@ spec: - region 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 + 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 + 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 @@ -536,21 +598,22 @@ spec: type: object type: array ruleGroupResponse: - description: The high-level properties of a rule group. This, along - with the RuleGroup, define the rule group. You can retrieve all - objects for a rule group by calling DescribeRuleGroup. + description: |- + The high-level properties of a rule group. This, along with the RuleGroup, + define the rule group. You can retrieve all objects for a rule group by calling + DescribeRuleGroup. properties: analysisResults: items: - description: The analysis result for Network Firewall's stateless - rule group analyzer. Every time you call CreateRuleGroup, - UpdateRuleGroup, or DescribeRuleGroup on a stateless rule - group, Network Firewall analyzes the stateless rule groups - in your account and identifies the rules that might adversely - effect your firewall's functionality. For example, if Network - Firewall detects a rule that's routing traffic asymmetrically, - which impacts the service's ability to properly process traffic, - the service includes the rule in a list of analysis results. + description: |- + The analysis result for Network Firewall's stateless rule group analyzer. + Every time you call CreateRuleGroup, UpdateRuleGroup, or DescribeRuleGroup + on a stateless rule group, Network Firewall analyzes the stateless rule groups + in your account and identifies the rules that might adversely effect your + firewall's functionality. For example, if Network Firewall detects a rule + that's routing traffic asymmetrically, which impacts the service's ability + to properly process traffic, the service includes the rule in a list of analysis + results. properties: analysisDetail: type: string @@ -571,15 +634,14 @@ spec: description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -604,11 +666,11 @@ spec: snsTopic: type: string sourceMetadata: - description: High-level information about the managed rule group - that your own rule group is copied from. You can use the the - metadata to track version updates made to the originating rule - group. You can retrieve all objects for a rule group by calling - DescribeRuleGroup (https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeRuleGroup.html). + description: |- + High-level information about the managed rule group that your own rule group + is copied from. You can use the the metadata to track version updates made + to the originating rule group. You can retrieve all objects for a rule group + by calling DescribeRuleGroup (https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeRuleGroup.html). properties: sourceARN: type: string @@ -617,13 +679,12 @@ spec: type: object tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -635,16 +696,18 @@ spec: type: string type: object updateToken: - description: "A token used for optimistic locking. Network Firewall - returns a token to your requests that access the rule group. The - token marks the state of the rule group resource at the time of - the request. \n To make changes to the rule group, you provide the - token in your request. Network Firewall uses the token to ensure - that the rule group hasn't changed since you last retrieved it. - If it has changed, the operation fails with an InvalidTokenException. - If this happens, retrieve the rule group again to get a current - copy of it with a current token. Reapply your changes as needed, - then try the operation again using the new token." + description: |- + A token used for optimistic locking. Network Firewall returns a token to + your requests that access the rule group. The token marks the state of the + rule group resource at the time of the request. + + + To make changes to the rule group, you provide the token in your request. + Network Firewall uses the token to ensure that the rule group hasn't changed + since you last retrieved it. If it has changed, the operation fails with + an InvalidTokenException. If this happens, retrieve the rule group again + to get a current copy of it with a current token. Reapply your changes as + needed, then try the operation again using the new token. type: string type: object type: object diff --git a/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml b/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml index 7dca541..65eff73 100644 --- a/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml +++ b/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: adoptedresources.services.k8s.aws spec: group: services.k8s.aws @@ -21,14 +20,19 @@ spec: description: AdoptedResource is the schema for the AdoptedResource 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' + 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' + 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 @@ -42,126 +46,149 @@ spec: additionalKeys: additionalProperties: type: string - description: AdditionalKeys represents any additional arbitrary - identifiers used when describing the target resource. + description: |- + AdditionalKeys represents any additional arbitrary identifiers used when + describing the target resource. type: object arn: - description: ARN is the AWS Resource Name for the resource. It - is a globally unique identifier. + description: |- + ARN is the AWS Resource Name for the resource. It is a globally + unique identifier. type: string nameOrID: - description: NameOrId is a user-supplied string identifier for - the resource. It may or may not be globally unique, depending - on the type of resource. + description: |- + NameOrId is a user-supplied string identifier for the resource. It may + or may not be globally unique, depending on the type of resource. type: string type: object kubernetes: - description: ResourceWithMetadata provides the values necessary to - create a Kubernetes resource and override any of its metadata values. + description: |- + ResourceWithMetadata provides the values necessary to create a + Kubernetes resource and override any of its metadata values. properties: group: type: string kind: type: string metadata: - description: "ObjectMeta is metadata that all persisted resources - must have, which includes all objects users must create. It - is not possible to use `metav1.ObjectMeta` inside spec, as the - controller-gen automatically converts this to an arbitrary string-string - map. https://github.com/kubernetes-sigs/controller-tools/issues/385 - \n Active discussion about inclusion of this field in the spec - is happening in this PR: https://github.com/kubernetes-sigs/controller-tools/pull/395 - \n Until this is allowed, or if it never is, we will produce - a subset of the object meta that contains only the fields which - the user is allowed to modify in the metadata." + description: |- + ObjectMeta is metadata that all persisted resources must have, which includes all objects + users must create. + It is not possible to use `metav1.ObjectMeta` inside spec, as the controller-gen + automatically converts this to an arbitrary string-string map. + https://github.com/kubernetes-sigs/controller-tools/issues/385 + + + Active discussion about inclusion of this field in the spec is happening in this PR: + https://github.com/kubernetes-sigs/controller-tools/pull/395 + + + Until this is allowed, or if it never is, we will produce a subset of the object meta + that contains only the fields which the user is allowed to modify in the metadata. properties: annotations: additionalProperties: type: string - description: 'Annotations is an unstructured key value map - stored with a resource that may be set by external tools - to store and retrieve arbitrary metadata. They are not queryable - and should be preserved when modifying objects. More info: - http://kubernetes.io/docs/user-guide/annotations' + description: |- + Annotations is an unstructured key value map stored with a resource that may be + set by external tools to store and retrieve arbitrary metadata. They are not + queryable and should be preserved when modifying objects. + More info: http://kubernetes.io/docs/user-guide/annotations type: object generateName: - description: "GenerateName is an optional prefix, used by - the server, to generate a unique name ONLY IF the Name field - has not been provided. If this field is used, the name returned - to the client will be different than the name passed. This - value will also be combined with a unique suffix. The provided - value has the same validation rules as the Name field, and - may be truncated by the length of the suffix required to - make the value unique on the server. \n If this field is - specified and the generated name exists, the server will - NOT return a 409 - instead, it will either return 201 Created - or 500 with Reason ServerTimeout indicating a unique name - could not be found in the time allotted, and the client - should retry (optionally after the time indicated in the - Retry-After header). \n Applied only if Name is not specified. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency" + description: |- + GenerateName is an optional prefix, used by the server, to generate a unique + name ONLY IF the Name field has not been provided. + If this field is used, the name returned to the client will be different + than the name passed. This value will also be combined with a unique suffix. + The provided value has the same validation rules as the Name field, + and may be truncated by the length of the suffix required to make the value + unique on the server. + + + If this field is specified and the generated name exists, the server will + NOT return a 409 - instead, it will either return 201 Created or 500 with Reason + ServerTimeout indicating a unique name could not be found in the time allotted, and the client + should retry (optionally after the time indicated in the Retry-After header). + + + Applied only if Name is not specified. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency type: string labels: additionalProperties: type: string - description: 'Map of string keys and values that can be used - to organize and categorize (scope and select) objects. May - match selectors of replication controllers and services. - More info: http://kubernetes.io/docs/user-guide/labels' + description: |- + Map of string keys and values that can be used to organize and categorize + (scope and select) objects. May match selectors of replication controllers + and services. + More info: http://kubernetes.io/docs/user-guide/labels type: object name: - description: 'Name must be unique within a namespace. Is required - when creating resources, although some resources may allow - a client to request the generation of an appropriate name - automatically. Name is primarily intended for creation idempotence - and configuration definition. Cannot be updated. More info: - http://kubernetes.io/docs/user-guide/identifiers#names' + description: |- + Name must be unique within a namespace. Is required when creating resources, although + some resources may allow a client to request the generation of an appropriate name + automatically. Name is primarily intended for creation idempotence and configuration + definition. + Cannot be updated. + More info: http://kubernetes.io/docs/user-guide/identifiers#names type: string namespace: - description: "Namespace defines the space within each name - must be unique. An empty namespace is equivalent to the - \"default\" namespace, but \"default\" is the canonical - representation. Not all objects are required to be scoped - to a namespace - the value of this field for those objects - will be empty. \n Must be a DNS_LABEL. Cannot be updated. - More info: http://kubernetes.io/docs/user-guide/namespaces" + description: |- + Namespace defines the space within each name must be unique. An empty namespace is + equivalent to the "default" namespace, but "default" is the canonical representation. + Not all objects are required to be scoped to a namespace - the value of this field for + those objects will be empty. + + + Must be a DNS_LABEL. + Cannot be updated. + More info: http://kubernetes.io/docs/user-guide/namespaces type: string ownerReferences: - description: List of objects depended by this object. If ALL - objects in the list have been deleted, this object will - be garbage collected. If this object is managed by a controller, - then an entry in this list will point to this controller, - with the controller field set to true. There cannot be more - than one managing controller. + description: |- + List of objects depended by this object. If ALL objects in the list have + been deleted, this object will be garbage collected. If this object is managed by a controller, + then an entry in this list will point to this controller, with the controller field set to true. + There cannot be more than one managing controller. items: - description: OwnerReference contains enough information - to let you identify an owning object. An owning object - must be in the same namespace as the dependent, or be - cluster-scoped, so there is no namespace field. + description: |- + OwnerReference contains enough information to let you identify an owning + object. An owning object must be in the same namespace as the dependent, or + be cluster-scoped, so there is no namespace field. properties: apiVersion: description: API version of the referent. type: string blockOwnerDeletion: - description: If true, AND if the owner has the "foregroundDeletion" - finalizer, then the owner cannot be deleted from the - key-value store until this reference is removed. Defaults - to false. To set this field, a user needs "delete" - permission of the owner, otherwise 422 (Unprocessable - Entity) will be returned. + description: |- + If true, AND if the owner has the "foregroundDeletion" finalizer, then + the owner cannot be deleted from the key-value store until this + reference is removed. + See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion + for how the garbage collector interacts with this field and enforces the foreground deletion. + Defaults to false. + To set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. type: boolean controller: description: If true, this reference points to the managing controller. type: boolean kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names type: string uid: - description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids type: string required: - apiVersion @@ -185,13 +212,14 @@ spec: AdoptedResource. properties: conditions: - description: A collection of `ackv1alpha1.Condition` objects that - describe the various terminal states of the adopted resource CR - and its target custom resource + description: |- + A collection of `ackv1alpha1.Condition` objects that describe the various + terminal states of the adopted resource CR and its target custom 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 + 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 diff --git a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml index 4a7ab61..4d3a8f1 100644 --- a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml +++ b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: fieldexports.services.k8s.aws spec: group: services.k8s.aws @@ -21,14 +20,19 @@ spec: description: FieldExport is the schema for the FieldExport 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' + 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' + 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 @@ -36,15 +40,17 @@ spec: description: FieldExportSpec defines the desired state of the FieldExport. properties: from: - description: ResourceFieldSelector provides the values necessary to - identify an individual field on an individual K8s resource. + description: |- + ResourceFieldSelector provides the values necessary to identify an individual + field on an individual K8s resource. properties: path: type: string resource: - description: NamespacedResource provides all the values necessary - to identify an ACK resource of a given type (within the same - namespace as the custom resource containing this type). + description: |- + NamespacedResource provides all the values necessary to identify an ACK + resource of a given type (within the same namespace as the custom resource + containing this type). properties: group: type: string @@ -62,16 +68,18 @@ spec: - resource type: object to: - description: FieldExportTarget provides the values necessary to identify - the output path for a field export. + description: |- + FieldExportTarget provides the values necessary to identify the + output path for a field export. properties: key: description: Key overrides the default value (`.`) for the FieldExport target type: string kind: - description: FieldExportOutputType represents all types that can - be produced by a field export operation + description: |- + FieldExportOutputType represents all types that can be produced by a field + export operation enum: - configmap - secret @@ -94,12 +102,14 @@ spec: description: FieldExportStatus defines the observed status of the FieldExport. properties: conditions: - description: A collection of `ackv1alpha1.Condition` objects that - describe the various recoverable states of the field CR + description: |- + A collection of `ackv1alpha1.Condition` objects that describe the various + recoverable states of the field CR 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 + 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 diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml index 4da8e32..a811602 100644 --- a/config/rbac/cluster-role-controller.yaml +++ b/config/rbac/cluster-role-controller.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: ack-networkfirewall-controller rules: - apiGroups: diff --git a/go.mod b/go.mod index abbd978..33e0a38 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,14 @@ go 1.21 toolchain go1.21.5 require ( - github.com/aws-controllers-k8s/runtime v0.29.2 + github.com/aws-controllers-k8s/runtime v0.30.0 github.com/aws/aws-sdk-go v1.49.0 - github.com/go-logr/logr v1.2.4 + github.com/go-logr/logr v1.4.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.2 - k8s.io/api v0.28.3 - k8s.io/apimachinery v0.28.3 - k8s.io/client-go v0.28.3 - sigs.k8s.io/controller-runtime v0.16.3 + k8s.io/api v0.29.0 + k8s.io/apimachinery v0.29.0 + k8s.io/client-go v0.29.0 + sigs.k8s.io/controller-runtime v0.17.0 ) require ( @@ -22,9 +21,9 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/zapr v1.2.4 // indirect + github.com/evanphx/json-patch/v5 v5.8.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect @@ -32,7 +31,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/imdario/mergo v0.3.12 // indirect @@ -43,38 +42,37 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.16.0 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/samber/lo v1.37.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.28.3 // indirect - k8s.io/component-base v0.28.3 // indirect - k8s.io/klog/v2 v2.100.1 // indirect - k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect + k8s.io/apiextensions-apiserver v0.29.0 // indirect + k8s.io/component-base v0.29.0 // indirect + k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 93b2cd3..2528b62 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,7 @@ -github.com/aws-controllers-k8s/runtime v0.29.2 h1:t6wwoKqFmtbblMcwFivpWp1FZa0gkczoUsk+maIsiRA= -github.com/aws-controllers-k8s/runtime v0.29.2/go.mod h1:mZa9l+/l+tlbxWVmMWWbUC3oAHUbeTzlI7xTOMdYHpA= +github.com/aws-controllers-k8s/runtime v0.30.0 h1:AibYRdi/7xUA3t8BA0u8g+J+OioaTAT6R4Vq8hxLiYw= +github.com/aws-controllers-k8s/runtime v0.30.0/go.mod h1:Pv1ozlUaO11KO2mwPN/HzhAtZ70ZDE9UP24mjsbkul0= github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY= github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= @@ -17,15 +16,15 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= -github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= +github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= +github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -38,7 +37,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= @@ -47,8 +45,9 @@ github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvR github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -64,7 +63,6 @@ github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921i github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A= github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow= github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -75,7 +73,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -87,8 +84,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -96,23 +93,22 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= +github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= -github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw= @@ -124,23 +120,17 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -148,55 +138,42 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -207,10 +184,9 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= @@ -223,27 +199,27 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= -k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= -k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08= -k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc= -k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= -k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= -k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= -k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= -k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI= -k8s.io/component-base v0.28.3/go.mod h1:fDJ6vpVNSk6cRo5wmDa6eKIG7UlIQkaFmZN2fYgIUD8= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= -sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= +k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= +k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= +k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= +k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= +k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= +k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= +k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= +k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= +k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= +k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s= +sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index b91dc70..f540d54 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: networkfirewall-chart description: A Helm chart for the ACK service controller for Network Firewall (NetworkFirewall) -version: 0.0.1 -appVersion: 0.0.1 +version: 0.0.2 +appVersion: 0.0.2 home: https://github.com/aws-controllers-k8s/networkfirewall-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/crds/networkfirewall.services.k8s.aws_firewallpolicies.yaml b/helm/crds/networkfirewall.services.k8s.aws_firewallpolicies.yaml index 167dfce..a706cc6 100644 --- a/helm/crds/networkfirewall.services.k8s.aws_firewallpolicies.yaml +++ b/helm/crds/networkfirewall.services.k8s.aws_firewallpolicies.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: firewallpolicies.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,31 +20,42 @@ spec: description: FirewallPolicy is the Schema for the FirewallPolicies 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' + 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' + 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: "FirewallPolicySpec defines the desired state of FirewallPolicy. - \n The firewall policy defines the behavior of a firewall using a collection - of stateless and stateful rule groups and other settings. You can use - one firewall policy for multiple firewalls. \n This, along with FirewallPolicyResponse, - define the policy. You can retrieve all objects for a firewall policy - by calling DescribeFirewallPolicy." + description: |- + FirewallPolicySpec defines the desired state of FirewallPolicy. + + + The firewall policy defines the behavior of a firewall using a collection + of stateless and stateful rule groups and other settings. You can use one + firewall policy for multiple firewalls. + + + This, along with FirewallPolicyResponse, define the policy. You can retrieve + all objects for a firewall policy by calling DescribeFirewallPolicy. properties: description: description: A description of the firewall policy. type: string encryptionConfiguration: - description: A complex type that contains settings for encryption - of your firewall policy resources. + description: |- + A complex type that contains settings for encryption of your firewall policy + resources. properties: keyID: type: string @@ -57,13 +67,15 @@ spec: policy. properties: policyVariables: - description: Contains variables that you can use to override default - Suricata settings in your firewall policy. + description: |- + Contains variables that you can use to override default Suricata settings + in your firewall policy. properties: ruleVariables: additionalProperties: - description: A list of IP addresses and address ranges, - in CIDR notation. This is part of a RuleVariables. + description: |- + A list of IP addresses and address ranges, in CIDR notation. This is part + of a RuleVariables. properties: definition: items: @@ -77,8 +89,9 @@ spec: type: string type: array statefulEngineOptions: - description: Configuration settings for the handling of the stateful - rule groups in a firewall policy. + description: |- + Configuration settings for the handling of the stateful rule groups in a + firewall policy. properties: ruleOrder: type: string @@ -87,12 +100,14 @@ spec: type: object statefulRuleGroupReferences: items: - description: Identifier for a single stateful rule group, used - in a firewall policy to refer to a rule group. + description: |- + Identifier for a single stateful rule group, used in a firewall policy to + refer to a rule group. properties: override: - description: The setting that allows the policy owner to - change the behavior of the rule group within a policy. + description: |- + The setting that allows the policy owner to change the behavior of the rule + group within a policy. properties: action: type: string @@ -106,44 +121,56 @@ spec: type: array statelessCustomActions: items: - description: "An optional, non-standard action to use for stateless - packet handling. You can define this in addition to the standard - action that you must specify. \n You define and name the custom - actions that you want to be able to use, and then you reference - them by name in your actions settings. \n You can use custom - actions in the following places: \n - In a rule group's StatelessRulesAndCustomActions - specification. The custom actions are available for use by - name inside the StatelessRulesAndCustomActions where you define - them. You can use them for your stateless rule actions to - specify what to do with a packet that matches the rule's match - attributes. \n - In a FirewallPolicy specification, in StatelessCustomActions. - The custom actions are available for use inside the policy - where you define them. You can use them for the policy's default - stateless actions settings to specify what to do with packets - that don't match any of the policy's stateless rules." + description: |- + An optional, non-standard action to use for stateless packet handling. You + can define this in addition to the standard action that you must specify. + + + You define and name the custom actions that you want to be able to use, and + then you reference them by name in your actions settings. + + + You can use custom actions in the following places: + + + - In a rule group's StatelessRulesAndCustomActions specification. The + custom actions are available for use by name inside the StatelessRulesAndCustomActions + where you define them. You can use them for your stateless rule actions + to specify what to do with a packet that matches the rule's match attributes. + + + - In a FirewallPolicy specification, in StatelessCustomActions. The custom + actions are available for use inside the policy where you define them. + You can use them for the policy's default stateless actions settings to + specify what to do with packets that don't match any of the policy's stateless + rules. properties: actionDefinition: - description: A custom action to use in stateless rule actions - settings. This is used in CustomAction. + description: |- + A custom action to use in stateless rule actions settings. This is used in + CustomAction. properties: publishMetricAction: - description: Stateless inspection criteria that publishes - the specified metrics to Amazon CloudWatch for the - matching packet. This setting defines a CloudWatch - dimension value to be published. + description: |- + Stateless inspection criteria that publishes the specified metrics to Amazon + CloudWatch for the matching packet. This setting defines a CloudWatch dimension + value to be published. properties: dimensions: items: - description: "The value to use in an Amazon CloudWatch - custom metric dimension. This is used in the - PublishMetrics CustomAction. A CloudWatch custom - metric dimension is a name/value pair that's - part of the identity of a metric. \n Network - Firewall sets the dimension name to CustomAction - and you provide the dimension value. \n For - more information about CloudWatch custom metric - dimensions, see Publishing Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) - in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html)." + description: |- + The value to use in an Amazon CloudWatch custom metric dimension. This is + used in the PublishMetrics CustomAction. A CloudWatch custom metric dimension + is a name/value pair that's part of the identity of a metric. + + + Network Firewall sets the dimension name to CustomAction and you provide + the dimension value. + + + For more information about CloudWatch custom metric dimensions, see Publishing + Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) + in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html). properties: value: type: string @@ -165,8 +192,9 @@ spec: type: array statelessRuleGroupReferences: items: - description: Identifier for a single stateless rule group, used - in a firewall policy to refer to the rule group. + description: |- + Identifier for a single stateless rule group, used in a firewall policy to + refer to the rule group. properties: priority: format: int64 @@ -179,17 +207,18 @@ spec: type: string type: object firewallPolicyName: - description: The descriptive name of the firewall policy. You can't - change the name of a firewall policy after you create it. + description: |- + The descriptive name of the firewall policy. You can't change the name of + a firewall policy after you create it. type: string tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -206,24 +235,26 @@ spec: description: FirewallPolicyStatus defines the observed state of FirewallPolicy properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -234,14 +265,16 @@ spec: - region 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 + 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 + 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 @@ -267,9 +300,10 @@ spec: type: object type: array firewallPolicyResponse: - description: The high-level properties of a firewall policy. This, - along with the FirewallPolicy, define the policy. You can retrieve - all objects for a firewall policy by calling DescribeFirewallPolicy. + description: |- + The high-level properties of a firewall policy. This, along with the FirewallPolicy, + define the policy. You can retrieve all objects for a firewall policy by + calling DescribeFirewallPolicy. properties: consumedStatefulRuleCapacity: format: int64 @@ -280,15 +314,14 @@ spec: description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -312,13 +345,12 @@ spec: type: integer tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -328,16 +360,18 @@ spec: type: array type: object updateToken: - description: "A token used for optimistic locking. Network Firewall - returns a token to your requests that access the firewall policy. - The token marks the state of the policy resource at the time of - the request. \n To make changes to the policy, you provide the token - in your request. Network Firewall uses the token to ensure that - the policy hasn't changed since you last retrieved it. If it has - changed, the operation fails with an InvalidTokenException. If this - happens, retrieve the firewall policy again to get a current copy - of it with current token. Reapply your changes as needed, then try - the operation again using the new token." + description: |- + A token used for optimistic locking. Network Firewall returns a token to + your requests that access the firewall policy. The token marks the state + of the policy resource at the time of the request. + + + To make changes to the policy, you provide the token in your request. Network + Firewall uses the token to ensure that the policy hasn't changed since you + last retrieved it. If it has changed, the operation fails with an InvalidTokenException. + If this happens, retrieve the firewall policy again to get a current copy + of it with current token. Reapply your changes as needed, then try the operation + again using the new token. type: string type: object type: object diff --git a/helm/crds/networkfirewall.services.k8s.aws_firewalls.yaml b/helm/crds/networkfirewall.services.k8s.aws_firewalls.yaml index 020ec92..896d5a1 100644 --- a/helm/crds/networkfirewall.services.k8s.aws_firewalls.yaml +++ b/helm/crds/networkfirewall.services.k8s.aws_firewalls.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: firewalls.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,33 +20,43 @@ spec: description: Firewall is the Schema for the Firewalls 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' + 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' + 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: "FirewallSpec defines the desired state of Firewall. \n The - firewall defines the configuration settings for an Network Firewall - firewall. These settings include the firewall policy, the subnets in - your VPC to use for the firewall endpoints, and any tags that are attached - to the firewall Amazon Web Services resource. \n The status of the firewall, - for example whether it's ready to filter network traffic, is provided - in the corresponding FirewallStatus. You can retrieve both objects by - calling DescribeFirewall." + description: |- + FirewallSpec defines the desired state of Firewall. + + + The firewall defines the configuration settings for an Network Firewall firewall. + These settings include the firewall policy, the subnets in your VPC to use + for the firewall endpoints, and any tags that are attached to the firewall + Amazon Web Services resource. + + + The status of the firewall, for example whether it's ready to filter network + traffic, is provided in the corresponding FirewallStatus. You can retrieve + both objects by calling DescribeFirewall. properties: deleteProtection: - description: A flag indicating whether it is possible to delete the - firewall. A setting of TRUE indicates that the firewall is protected - against deletion. Use this setting to protect against accidentally - deleting a firewall that is in use. When you create a firewall, - the operation initializes this flag to TRUE. + description: |- + A flag indicating whether it is possible to delete the firewall. A setting + of TRUE indicates that the firewall is protected against deletion. Use this + setting to protect against accidentally deleting a firewall that is in use. + When you create a firewall, the operation initializes this flag to TRUE. type: boolean description: description: A description of the firewall. @@ -62,37 +71,40 @@ spec: type: string type: object firewallName: - description: The descriptive name of the firewall. You can't change - the name of a firewall after you create it. + description: |- + The descriptive name of the firewall. You can't change the name of a firewall + after you create it. type: string firewallPolicyARN: - description: The Amazon Resource Name (ARN) of the FirewallPolicy - that you want to use for the firewall. + description: |- + The Amazon Resource Name (ARN) of the FirewallPolicy that you want to use + for the firewall. type: string firewallPolicyChangeProtection: - description: A setting indicating whether the firewall is protected - against a change to the firewall policy association. Use this setting - to protect against accidentally modifying the firewall policy for - a firewall that is in use. When you create a firewall, the operation - initializes this setting to TRUE. + description: |- + A setting indicating whether the firewall is protected against a change to + the firewall policy association. Use this setting to protect against accidentally + modifying the firewall policy for a firewall that is in use. When you create + a firewall, the operation initializes this setting to TRUE. type: boolean subnetChangeProtection: - description: A setting indicating whether the firewall is protected - against changes to the subnet associations. Use this setting to - protect against accidentally modifying the subnet associations for - a firewall that is in use. When you create a firewall, the operation - initializes this setting to TRUE. + description: |- + A setting indicating whether the firewall is protected against changes to + the subnet associations. Use this setting to protect against accidentally + modifying the subnet associations for a firewall that is in use. When you + create a firewall, the operation initializes this setting to TRUE. type: boolean subnetMappings: - description: The public subnets to use for your Network Firewall firewalls. - Each subnet must belong to a different Availability Zone in the - VPC. Network Firewall creates a firewall endpoint in each subnet. + description: |- + The public subnets to use for your Network Firewall firewalls. Each subnet + must belong to a different Availability Zone in the VPC. Network Firewall + creates a firewall endpoint in each subnet. items: - description: The ID for a subnet that you want to associate with - the firewall. This is used with CreateFirewall and AssociateSubnets. - Network Firewall creates an instance of the associated firewall - in each subnet that you specify, to filter traffic in the subnet's - Availability Zone. + description: |- + The ID for a subnet that you want to associate with the firewall. This is + used with CreateFirewall and AssociateSubnets. Network Firewall creates an + instance of the associated firewall in each subnet that you specify, to filter + traffic in the subnet's Availability Zone. properties: iPAddressType: type: string @@ -103,11 +115,11 @@ spec: tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -117,9 +129,12 @@ spec: type: object type: array vpcID: - description: "The unique identifier of the VPC where Network Firewall - should create the firewall. \n You can't change this setting after - you create the firewall." + description: |- + The unique identifier of the VPC where Network Firewall should create the + firewall. + + + You can't change this setting after you create the firewall. type: string required: - firewallName @@ -131,24 +146,26 @@ spec: description: FirewallStatus defines the observed state of Firewall properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -159,14 +176,16 @@ spec: - region 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 + 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 + 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 @@ -192,24 +211,23 @@ spec: type: object type: array firewall: - description: The configuration settings for the firewall. These settings - include the firewall policy and the subnets in your VPC to use for - the firewall endpoints. + description: |- + The configuration settings for the firewall. These settings include the firewall + policy and the subnets in your VPC to use for the firewall endpoints. properties: deleteProtection: type: boolean description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -231,11 +249,11 @@ spec: type: boolean subnetMappings: items: - description: The ID for a subnet that you want to associate - with the firewall. This is used with CreateFirewall and AssociateSubnets. - Network Firewall creates an instance of the associated firewall - in each subnet that you specify, to filter traffic in the - subnet's Availability Zone. + description: |- + The ID for a subnet that you want to associate with the firewall. This is + used with CreateFirewall and AssociateSubnets. Network Firewall creates an + instance of the associated firewall in each subnet that you specify, to filter + traffic in the subnet's Availability Zone. properties: iPAddressType: type: string @@ -245,13 +263,12 @@ spec: type: array tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -263,19 +280,21 @@ spec: type: string type: object firewallStatus: - description: Detailed information about the current status of a Firewall. - You can retrieve this for a firewall by calling DescribeFirewall - and providing the firewall name and ARN. + description: |- + Detailed information about the current status of a Firewall. You can retrieve + this for a firewall by calling DescribeFirewall and providing the firewall + name and ARN. properties: capacityUsageSummary: - description: The capacity usage summary of the resources used - by the ReferenceSets in a firewall. + description: |- + The capacity usage summary of the resources used by the ReferenceSets in + a firewall. properties: cidrs: - description: Summarizes the CIDR blocks used by the IP set - references in a firewall. Network Firewall calculates the - number of CIDRs by taking an aggregated count of all CIDRs - used by the IP sets you are referencing. + description: |- + Summarizes the CIDR blocks used by the IP set references in a firewall. Network + Firewall calculates the number of CIDRs by taking an aggregated count of + all CIDRs used by the IP sets you are referencing. properties: availableCIDRCount: format: int64 @@ -300,22 +319,30 @@ spec: type: string syncStates: additionalProperties: - description: "The status of the firewall endpoint and firewall - policy configuration for a single VPC subnet. \n For each - VPC subnet that you associate with a firewall, Network Firewall - does the following: \n - Instantiates a firewall endpoint - in the subnet, ready to take traffic. \n - Configures the - endpoint with the current firewall policy settings, to provide - the filtering behavior for the endpoint. \n When you update - a firewall, for example to add a subnet association or change - a rule group in the firewall policy, the affected sync states - reflect out-of-sync or not ready status until the changes - are complete." + description: |- + The status of the firewall endpoint and firewall policy configuration for + a single VPC subnet. + + + For each VPC subnet that you associate with a firewall, Network Firewall + does the following: + + + - Instantiates a firewall endpoint in the subnet, ready to take traffic. + + + - Configures the endpoint with the current firewall policy settings, to + provide the filtering behavior for the endpoint. + + + When you update a firewall, for example to add a subnet association or change + a rule group in the firewall policy, the affected sync states reflect out-of-sync + or not ready status until the changes are complete. properties: attachment: - description: The configuration and status for a single subnet - that you've specified for use by the Network Firewall - firewall. This is part of the FirewallStatus. + description: |- + The configuration and status for a single subnet that you've specified for + use by the Network Firewall firewall. This is part of the FirewallStatus. properties: endpointID: type: string @@ -328,14 +355,13 @@ spec: type: object config: additionalProperties: - description: Provides configuration status for a single - policy or rule group that is used for a firewall endpoint. - Network Firewall provides each endpoint with the rules - that are configured in the firewall policy. Each time - you add a subnet or modify the associated firewall policy, - Network Firewall synchronizes the rules in the endpoint, - so it can properly filter network traffic. This is part - of a SyncState for a firewall. + description: |- + Provides configuration status for a single policy or rule group that is used + for a firewall endpoint. Network Firewall provides each endpoint with the + rules that are configured in the firewall policy. Each time you add a subnet + or modify the associated firewall policy, Network Firewall synchronizes the + rules in the endpoint, so it can properly filter network traffic. This is + part of a SyncState for a firewall. properties: syncStatus: type: string diff --git a/helm/crds/networkfirewall.services.k8s.aws_rulegroups.yaml b/helm/crds/networkfirewall.services.k8s.aws_rulegroups.yaml index 263b62e..b97c1c1 100644 --- a/helm/crds/networkfirewall.services.k8s.aws_rulegroups.yaml +++ b/helm/crds/networkfirewall.services.k8s.aws_rulegroups.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: rulegroups.networkfirewall.services.k8s.aws spec: group: networkfirewall.services.k8s.aws @@ -21,82 +20,123 @@ spec: description: RuleGroup is the Schema for the RuleGroups 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' + 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' + 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: "RuleGroupSpec defines the desired state of RuleGroup. \n - The object that defines the rules in a rule group. This, along with - RuleGroupResponse, define the rule group. You can retrieve all objects - for a rule group by calling DescribeRuleGroup. \n Network Firewall uses - a rule group to inspect and control network traffic. You define stateless - rule groups to inspect individual packets and you define stateful rule - groups to inspect packets in the context of their traffic flow. \n To - use a rule group, you include it by reference in an Network Firewall - firewall policy, then you use the policy in a firewall. You can reference - a rule group from more than one firewall policy, and you can use a firewall - policy in more than one firewall." + description: |- + RuleGroupSpec defines the desired state of RuleGroup. + + + The object that defines the rules in a rule group. This, along with RuleGroupResponse, + define the rule group. You can retrieve all objects for a rule group by calling + DescribeRuleGroup. + + + Network Firewall uses a rule group to inspect and control network traffic. + You define stateless rule groups to inspect individual packets and you define + stateful rule groups to inspect packets in the context of their traffic flow. + + + To use a rule group, you include it by reference in an Network Firewall firewall + policy, then you use the policy in a firewall. You can reference a rule group + from more than one firewall policy, and you can use a firewall policy in + more than one firewall. properties: analyzeRuleGroup: - description: Indicates whether you want Network Firewall to analyze - the stateless rules in the rule group for rule behavior such as - asymmetric routing. If set to TRUE, Network Firewall runs the analysis - and then creates the rule group for you. To run the stateless rule - group analyzer without creating the rule group, set DryRun to TRUE. + description: |- + Indicates whether you want Network Firewall to analyze the stateless rules + in the rule group for rule behavior such as asymmetric routing. If set to + TRUE, Network Firewall runs the analysis and then creates the rule group + for you. To run the stateless rule group analyzer without creating the rule + group, set DryRun to TRUE. type: boolean capacity: - description: "The maximum operating resources that this rule group - can use. Rule group capacity is fixed at creation. When you update - a rule group, you are limited to this capacity. When you reference - a rule group from a firewall policy, Network Firewall reserves this - capacity for the rule group. \n You can retrieve the capacity that - would be required for a rule group before you create the rule group - by calling CreateRuleGroup with DryRun set to TRUE. \n You can't - change or exceed this capacity when you update the rule group, so - leave room for your rule group to grow. \n # Capacity for a stateless - rule group \n For a stateless rule group, the capacity required - is the sum of the capacity requirements of the individual rules - that you expect to have in the rule group. \n To calculate the capacity - requirement of a single rule, multiply the capacity requirement - values of each of the rule's match settings: \n - A match setting - with no criteria specified has a value of 1. \n - A match setting - with Any specified has a value of 1. \n - All other match settings - have a value equal to the number of elements provided in the setting. - For example, a protocol setting [\"UDP\"] and a source setting [\"10.0.0.0/24\"] - each have a value of 1. A protocol setting [\"UDP\",\"TCP\"] has - a value of 2. A source setting [\"10.0.0.0/24\",\"10.0.0.1/24\",\"10.0.0.2/24\"] - has a value of 3. \n A rule with no criteria specified in any of - its match settings has a capacity requirement of 1. A rule with - protocol setting [\"UDP\",\"TCP\"], source setting [\"10.0.0.0/24\",\"10.0.0.1/24\",\"10.0.0.2/24\"], - and a single specification or no specification for each of the other - match settings has a capacity requirement of 6. \n # Capacity for - a stateful rule group \n For a stateful rule group, the minimum - capacity required is the number of individual rules that you expect - to have in the rule group." + description: |- + The maximum operating resources that this rule group can use. Rule group + capacity is fixed at creation. When you update a rule group, you are limited + to this capacity. When you reference a rule group from a firewall policy, + Network Firewall reserves this capacity for the rule group. + + + You can retrieve the capacity that would be required for a rule group before + you create the rule group by calling CreateRuleGroup with DryRun set to TRUE. + + + You can't change or exceed this capacity when you update the rule group, + so leave room for your rule group to grow. + + + # Capacity for a stateless rule group + + + For a stateless rule group, the capacity required is the sum of the capacity + requirements of the individual rules that you expect to have in the rule + group. + + + To calculate the capacity requirement of a single rule, multiply the capacity + requirement values of each of the rule's match settings: + + + - A match setting with no criteria specified has a value of 1. + + + - A match setting with Any specified has a value of 1. + + + - All other match settings have a value equal to the number of elements + provided in the setting. For example, a protocol setting ["UDP"] and a + source setting ["10.0.0.0/24"] each have a value of 1. A protocol setting + ["UDP","TCP"] has a value of 2. A source setting ["10.0.0.0/24","10.0.0.1/24","10.0.0.2/24"] + has a value of 3. + + + A rule with no criteria specified in any of its match settings has a capacity + requirement of 1. A rule with protocol setting ["UDP","TCP"], source setting + ["10.0.0.0/24","10.0.0.1/24","10.0.0.2/24"], and a single specification or + no specification for each of the other match settings has a capacity requirement + of 6. + + + # Capacity for a stateful rule group + + + For a stateful rule group, the minimum capacity required is the number of + individual rules that you expect to have in the rule group. format: int64 type: integer description: description: A description of the rule group. type: string dryRun: - description: "Indicates whether you want Network Firewall to just - check the validity of the request, rather than run the request. - \n If set to TRUE, Network Firewall checks whether the request can - run successfully, but doesn't actually make the requested changes. - The call returns the value that the request would return if you - ran it with dry run set to FALSE, but doesn't make additions or - changes to your resources. This option allows you to make sure that - you have the required permissions to run the request and that your - request parameters are valid. \n If set to FALSE, Network Firewall - makes the requested changes to your resources." + description: |- + Indicates whether you want Network Firewall to just check the validity of + the request, rather than run the request. + + + If set to TRUE, Network Firewall checks whether the request can run successfully, + but doesn't actually make the requested changes. The call returns the value + that the request would return if you ran it with dry run set to FALSE, but + doesn't make additions or changes to your resources. This option allows you + to make sure that you have the required permissions to run the request and + that your request parameters are valid. + + + If set to FALSE, Network Firewall makes the requested changes to your resources. type: boolean encryptionConfiguration: description: A complex type that contains settings for encryption @@ -108,31 +148,34 @@ spec: type: string type: object ruleGroup: - description: "An object that defines the rule group rules. \n You - must provide either this rule group setting or a Rules setting, - but not both." + description: |- + An object that defines the rule group rules. + + + You must provide either this rule group setting or a Rules setting, but not + both. properties: referenceSets: description: Contains a set of IP set references. properties: iPSetReferences: additionalProperties: - description: "Configures one or more IP set references for - a Suricata-compatible rule group. This is used in CreateRuleGroup - or UpdateRuleGroup. An IP set reference is a rule variable - that references resources that you create and manage in - another Amazon Web Services service, such as an Amazon - VPC prefix list. Network Firewall IP set references enable - you to dynamically update the contents of your rules. - When you create, update, or delete the resource you are - referencing in your rule, Network Firewall automatically - updates the rule's content with the changes. For more - information about IP set references in Network Firewall, + description: |- + Configures one or more IP set references for a Suricata-compatible rule group. + This is used in CreateRuleGroup or UpdateRuleGroup. An IP set reference is + a rule variable that references resources that you create and manage in another + Amazon Web Services service, such as an Amazon VPC prefix list. Network Firewall + IP set references enable you to dynamically update the contents of your rules. + When you create, update, or delete the resource you are referencing in your + rule, Network Firewall automatically updates the rule's content with the + changes. For more information about IP set references in Network Firewall, see Using IP set references (https://docs.aws.amazon.com/network-firewall/latest/developerguide/rule-groups-ip-set-references) - in the Network Firewall Developer Guide. \n Network Firewall - currently supports Amazon VPC prefix lists (https://docs.aws.amazon.com/vpc/latest/userguide/managed-prefix-lists.html) + in the Network Firewall Developer Guide. + + + Network Firewall currently supports Amazon VPC prefix lists (https://docs.aws.amazon.com/vpc/latest/userguide/managed-prefix-lists.html) and resource groups (https://docs.aws.amazon.com/network-firewall/latest/developerguide/rule-groups-ip-set-references.html#rule-groups-referencing-resource-groups) - in IP set references." + in IP set references. properties: referenceARN: type: string @@ -140,13 +183,15 @@ spec: type: object type: object ruleVariables: - description: Settings that are available for use in the rules - in the RuleGroup where this is defined. + description: |- + Settings that are available for use in the rules in the RuleGroup where this + is defined. properties: iPSets: additionalProperties: - description: A list of IP addresses and address ranges, - in CIDR notation. This is part of a RuleVariables. + description: |- + A list of IP addresses and address ranges, in CIDR notation. This is part + of a RuleVariables. properties: definition: items: @@ -167,24 +212,27 @@ spec: type: object type: object rulesSource: - description: The stateless or stateful rules definitions for use - in a single rule group. Each rule group requires a single RulesSource. - You can use an instance of this for either stateless rules or - stateful rules. + description: |- + The stateless or stateful rules definitions for use in a single rule group. + Each rule group requires a single RulesSource. You can use an instance of + this for either stateless rules or stateful rules. properties: rulesSourceList: - description: "Stateful inspection criteria for a domain list - rule group. \n For HTTPS traffic, domain filtering is SNI-based. - It uses the server name indicator extension of the TLS handshake. - \n By default, Network Firewall domain list inspection only - includes traffic coming from the VPC where you deploy the - firewall. To inspect traffic from IP addresses outside of - the deployment VPC, you set the HOME_NET rule variable to - include the CIDR range of the deployment VPC plus the other - CIDR ranges. For more information, see RuleVariables in - this guide and Stateful domain list rule groups in Network - Firewall (https://docs.aws.amazon.com/network-firewall/latest/developerguide/stateful-rule-groups-domain-names.html) - in the Network Firewall Developer Guide." + description: |- + Stateful inspection criteria for a domain list rule group. + + + For HTTPS traffic, domain filtering is SNI-based. It uses the server name + indicator extension of the TLS handshake. + + + By default, Network Firewall domain list inspection only includes traffic + coming from the VPC where you deploy the firewall. To inspect traffic from + IP addresses outside of the deployment VPC, you set the HOME_NET rule variable + to include the CIDR range of the deployment VPC plus the other CIDR ranges. + For more information, see RuleVariables in this guide and Stateful domain + list rule groups in Network Firewall (https://docs.aws.amazon.com/network-firewall/latest/developerguide/stateful-rule-groups-domain-names.html) + in the Network Firewall Developer Guide. properties: generatedRulesType: type: string @@ -201,18 +249,18 @@ spec: type: string statefulRules: items: - description: A single Suricata rules specification, for - use in a stateful rule group. Use this option to specify - a simple Suricata rule with protocol, source and destination, - ports, direction, and rule options. For information about - the Suricata Rules format, see Rules Format (https://suricata.readthedocs.io/en/suricata-6.0.9/rules/intro.html). + description: |- + A single Suricata rules specification, for use in a stateful rule group. + Use this option to specify a simple Suricata rule with protocol, source and + destination, ports, direction, and rule options. For information about the + Suricata Rules format, see Rules Format (https://suricata.readthedocs.io/en/suricata-6.0.9/rules/intro.html). properties: action: type: string header: - description: The basic rule criteria for Network Firewall - to use to inspect packet headers in stateful traffic - flow inspection. Traffic flows that match the criteria + description: |- + The basic rule criteria for Network Firewall to use to inspect packet headers + in stateful traffic flow inspection. Traffic flows that match the criteria are a match for the corresponding StatefulRule. properties: destination: @@ -230,8 +278,9 @@ spec: type: object ruleOptions: items: - description: Additional settings for a stateful rule. - This is part of the StatefulRule configuration. + description: |- + Additional settings for a stateful rule. This is part of the StatefulRule + configuration. properties: keyword: type: string @@ -244,58 +293,62 @@ spec: type: object type: array statelessRulesAndCustomActions: - description: Stateless inspection criteria. Each stateless - rule group uses exactly one of these data types to define - its stateless rules. + description: |- + Stateless inspection criteria. Each stateless rule group uses exactly one + of these data types to define its stateless rules. properties: customActions: items: - description: "An optional, non-standard action to use - for stateless packet handling. You can define this - in addition to the standard action that you must specify. - \n You define and name the custom actions that you - want to be able to use, and then you reference them - by name in your actions settings. \n You can use custom - actions in the following places: \n - In a rule group's - StatelessRulesAndCustomActions specification. The - custom actions are available for use by name inside - the StatelessRulesAndCustomActions where you define - them. You can use them for your stateless rule actions - to specify what to do with a packet that matches the - rule's match attributes. \n - In a FirewallPolicy - specification, in StatelessCustomActions. The custom - actions are available for use inside the policy where - you define them. You can use them for the policy's - default stateless actions settings to specify what - to do with packets that don't match any of the policy's - stateless rules." + description: |- + An optional, non-standard action to use for stateless packet handling. You + can define this in addition to the standard action that you must specify. + + + You define and name the custom actions that you want to be able to use, and + then you reference them by name in your actions settings. + + + You can use custom actions in the following places: + + + - In a rule group's StatelessRulesAndCustomActions specification. The + custom actions are available for use by name inside the StatelessRulesAndCustomActions + where you define them. You can use them for your stateless rule actions + to specify what to do with a packet that matches the rule's match attributes. + + + - In a FirewallPolicy specification, in StatelessCustomActions. The custom + actions are available for use inside the policy where you define them. + You can use them for the policy's default stateless actions settings to + specify what to do with packets that don't match any of the policy's stateless + rules. properties: actionDefinition: - description: A custom action to use in stateless - rule actions settings. This is used in CustomAction. + description: |- + A custom action to use in stateless rule actions settings. This is used in + CustomAction. properties: publishMetricAction: - description: Stateless inspection criteria that - publishes the specified metrics to Amazon - CloudWatch for the matching packet. This setting - defines a CloudWatch dimension value to be - published. + description: |- + Stateless inspection criteria that publishes the specified metrics to Amazon + CloudWatch for the matching packet. This setting defines a CloudWatch dimension + value to be published. properties: dimensions: items: - description: "The value to use in an Amazon - CloudWatch custom metric dimension. - This is used in the PublishMetrics CustomAction. - A CloudWatch custom metric dimension - is a name/value pair that's part of - the identity of a metric. \n Network - Firewall sets the dimension name to - CustomAction and you provide the dimension - value. \n For more information about - CloudWatch custom metric dimensions, - see Publishing Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) - in the Amazon CloudWatch User Guide - (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html)." + description: |- + The value to use in an Amazon CloudWatch custom metric dimension. This is + used in the PublishMetrics CustomAction. A CloudWatch custom metric dimension + is a name/value pair that's part of the identity of a metric. + + + Network Firewall sets the dimension name to CustomAction and you provide + the dimension value. + + + For more information about CloudWatch custom metric dimensions, see Publishing + Custom Metrics (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html#usingDimensions) + in the Amazon CloudWatch User Guide (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html). properties: value: type: string @@ -316,31 +369,27 @@ spec: format: int64 type: integer ruleDefinition: - description: The inspection criteria and action - for a single stateless rule. Network Firewall - inspects each packet for the specified matching - criteria. When a packet matches the criteria, - Network Firewall performs the rule's actions on - the packet. + description: |- + The inspection criteria and action for a single stateless rule. Network Firewall + inspects each packet for the specified matching criteria. When a packet matches + the criteria, Network Firewall performs the rule's actions on the packet. properties: actions: items: type: string type: array matchAttributes: - description: Criteria for Network Firewall to - use to inspect an individual packet in stateless - rule inspection. Each match attributes set - can include one or more items such as IP address, - CIDR range, port number, protocol, and TCP - flags. + description: |- + Criteria for Network Firewall to use to inspect an individual packet in stateless + rule inspection. Each match attributes set can include one or more items + such as IP address, CIDR range, port number, protocol, and TCP flags. properties: destinationPorts: items: - description: A single port range specification. - This is used for source and destination - port ranges in the stateless rule MatchAttributes, - SourcePorts, and DestinationPorts settings. + description: |- + A single port range specification. This is used for source and destination + port ranges in the stateless rule MatchAttributes, SourcePorts, and DestinationPorts + settings. properties: fromPort: format: int64 @@ -352,9 +401,9 @@ spec: type: array destinations: items: - description: A single IP address specification. - This is used in the MatchAttributes - source and destination specifications. + description: |- + A single IP address specification. This is used in the MatchAttributes source + and destination specifications. properties: addressDefinition: type: string @@ -367,10 +416,10 @@ spec: type: array sourcePorts: items: - description: A single port range specification. - This is used for source and destination - port ranges in the stateless rule MatchAttributes, - SourcePorts, and DestinationPorts settings. + description: |- + A single port range specification. This is used for source and destination + port ranges in the stateless rule MatchAttributes, SourcePorts, and DestinationPorts + settings. properties: fromPort: format: int64 @@ -382,9 +431,9 @@ spec: type: array sources: items: - description: A single IP address specification. - This is used in the MatchAttributes - source and destination specifications. + description: |- + A single IP address specification. This is used in the MatchAttributes source + and destination specifications. properties: addressDefinition: type: string @@ -392,9 +441,9 @@ spec: type: array tcpFlags: items: - description: TCP flags and masks to inspect - packets for, used in stateless rules - MatchAttributes settings. + description: |- + TCP flags and masks to inspect packets for, used in stateless rules MatchAttributes + settings. properties: flags: items: @@ -413,32 +462,40 @@ spec: type: object type: object statefulRuleOptions: - description: Additional options governing how Network Firewall - handles the rule group. You can only use these for stateful - rule groups. + description: |- + Additional options governing how Network Firewall handles the rule group. + You can only use these for stateful rule groups. properties: ruleOrder: type: string type: object type: object ruleGroupName: - description: The descriptive name of the rule group. You can't change - the name of a rule group after you create it. + description: |- + The descriptive name of the rule group. You can't change the name of a rule + group after you create it. type: string rules: - description: "A string containing stateful rule group rules specifications - in Suricata flat format, with one rule per line. Use this to import - your existing Suricata compatible rule groups. \n You must provide - either this rules setting or a populated RuleGroup setting, but - not both. \n You can provide your rule group specification in Suricata - flat format through this setting when you create or update your - rule group. The call response returns a RuleGroup object that Network - Firewall has populated from your string." + description: |- + A string containing stateful rule group rules specifications in Suricata + flat format, with one rule per line. Use this to import your existing Suricata + compatible rule groups. + + + You must provide either this rules setting or a populated RuleGroup setting, + but not both. + + + You can provide your rule group specification in Suricata flat format through + this setting when you create or update your rule group. The call response + returns a RuleGroup object that Network Firewall has populated from your + string. type: string sourceMetadata: - description: A complex type that contains metadata about the rule - group that your own rule group is copied from. You can use the metadata - to keep track of updates made to the originating rule group. + description: |- + A complex type that contains metadata about the rule group that your own + rule group is copied from. You can use the metadata to keep track of updates + made to the originating rule group. properties: sourceARN: type: string @@ -448,11 +505,11 @@ spec: tags: description: The key:value pairs to associate with the resource. items: - description: A key:value pair associated with an Amazon Web Services - resource. The key:value pair can be anything you define. Typically, - the tag key represents a category (such as "environment") and - the tag value represents a specific value within that category - (such as "test," "development," or "production"). You can add + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add up to 50 tags to each Amazon Web Services resource. properties: key: @@ -462,9 +519,10 @@ spec: type: object type: array type_: - description: Indicates whether the rule group is stateless or stateful. - If the rule group is stateless, it contains stateless rules. If - it is stateful, it contains stateful rules. + description: |- + Indicates whether the rule group is stateless or stateful. If the rule group + is stateless, it contains stateless rules. If it is stateful, it contains + stateful rules. type: string required: - capacity @@ -475,24 +533,26 @@ spec: description: RuleGroupStatus defines the observed state of RuleGroup properties: ackResourceMetadata: - description: All CRs managed by ACK have a common `Status.ACKResourceMetadata` - member that is used to contain resource sync state, account ownership, + 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' + 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. + description: |- + OwnerAccountID is the AWS Account ID of the account that owns the + backend AWS service API resource. type: string region: description: Region is the AWS region in which the resource exists @@ -503,14 +563,16 @@ spec: - region 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 + 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 + 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 @@ -536,21 +598,22 @@ spec: type: object type: array ruleGroupResponse: - description: The high-level properties of a rule group. This, along - with the RuleGroup, define the rule group. You can retrieve all - objects for a rule group by calling DescribeRuleGroup. + description: |- + The high-level properties of a rule group. This, along with the RuleGroup, + define the rule group. You can retrieve all objects for a rule group by calling + DescribeRuleGroup. properties: analysisResults: items: - description: The analysis result for Network Firewall's stateless - rule group analyzer. Every time you call CreateRuleGroup, - UpdateRuleGroup, or DescribeRuleGroup on a stateless rule - group, Network Firewall analyzes the stateless rule groups - in your account and identifies the rules that might adversely - effect your firewall's functionality. For example, if Network - Firewall detects a rule that's routing traffic asymmetrically, - which impacts the service's ability to properly process traffic, - the service includes the rule in a list of analysis results. + description: |- + The analysis result for Network Firewall's stateless rule group analyzer. + Every time you call CreateRuleGroup, UpdateRuleGroup, or DescribeRuleGroup + on a stateless rule group, Network Firewall analyzes the stateless rule groups + in your account and identifies the rules that might adversely effect your + firewall's functionality. For example, if Network Firewall detects a rule + that's routing traffic asymmetrically, which impacts the service's ability + to properly process traffic, the service includes the rule in a list of analysis + results. properties: analysisDetail: type: string @@ -571,15 +634,14 @@ spec: description: type: string encryptionConfiguration: - description: A complex type that contains optional Amazon Web - Services Key Management Service (KMS) encryption settings for - your Network Firewall resources. Your data is encrypted by default - with an Amazon Web Services owned key that Amazon Web Services - owns and manages for you. You can use either the Amazon Web - Services owned key, or provide your own customer managed key. - To learn more about KMS encryption of your Network Firewall - resources, see Encryption at rest with Amazon Web Services Key - Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) + description: |- + A complex type that contains optional Amazon Web Services Key Management + Service (KMS) encryption settings for your Network Firewall resources. Your + data is encrypted by default with an Amazon Web Services owned key that Amazon + Web Services owns and manages for you. You can use either the Amazon Web + Services owned key, or provide your own customer managed key. To learn more + about KMS encryption of your Network Firewall resources, see Encryption at + rest with Amazon Web Services Key Managment Service (https://docs.aws.amazon.com/kms/latest/developerguide/kms-encryption-at-rest.html) in the Network Firewall Developer Guide. properties: keyID: @@ -604,11 +666,11 @@ spec: snsTopic: type: string sourceMetadata: - description: High-level information about the managed rule group - that your own rule group is copied from. You can use the the - metadata to track version updates made to the originating rule - group. You can retrieve all objects for a rule group by calling - DescribeRuleGroup (https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeRuleGroup.html). + description: |- + High-level information about the managed rule group that your own rule group + is copied from. You can use the the metadata to track version updates made + to the originating rule group. You can retrieve all objects for a rule group + by calling DescribeRuleGroup (https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeRuleGroup.html). properties: sourceARN: type: string @@ -617,13 +679,12 @@ spec: type: object tags: items: - description: A key:value pair associated with an Amazon Web - Services resource. The key:value pair can be anything you - define. Typically, the tag key represents a category (such - as "environment") and the tag value represents a specific - value within that category (such as "test," "development," - or "production"). You can add up to 50 tags to each Amazon - Web Services resource. + description: |- + A key:value pair associated with an Amazon Web Services resource. The key:value + pair can be anything you define. Typically, the tag key represents a category + (such as "environment") and the tag value represents a specific value within + that category (such as "test," "development," or "production"). You can add + up to 50 tags to each Amazon Web Services resource. properties: key: type: string @@ -635,16 +696,18 @@ spec: type: string type: object updateToken: - description: "A token used for optimistic locking. Network Firewall - returns a token to your requests that access the rule group. The - token marks the state of the rule group resource at the time of - the request. \n To make changes to the rule group, you provide the - token in your request. Network Firewall uses the token to ensure - that the rule group hasn't changed since you last retrieved it. - If it has changed, the operation fails with an InvalidTokenException. - If this happens, retrieve the rule group again to get a current - copy of it with a current token. Reapply your changes as needed, - then try the operation again using the new token." + description: |- + A token used for optimistic locking. Network Firewall returns a token to + your requests that access the rule group. The token marks the state of the + rule group resource at the time of the request. + + + To make changes to the rule group, you provide the token in your request. + Network Firewall uses the token to ensure that the rule group hasn't changed + since you last retrieved it. If it has changed, the operation fails with + an InvalidTokenException. If this happens, retrieve the rule group again + to get a current copy of it with a current token. Reapply your changes as + needed, then try the operation again using the new token. type: string type: object type: object diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml index 9a12ef7..65eff73 100644 --- a/helm/crds/services.k8s.aws_adoptedresources.yaml +++ b/helm/crds/services.k8s.aws_adoptedresources.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: adoptedresources.services.k8s.aws spec: group: services.k8s.aws @@ -21,14 +20,19 @@ spec: description: AdoptedResource is the schema for the AdoptedResource 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' + 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' + 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 @@ -42,129 +46,149 @@ spec: additionalKeys: additionalProperties: type: string - description: AdditionalKeys represents any additional arbitrary - identifiers used when describing the target resource. + description: |- + AdditionalKeys represents any additional arbitrary identifiers used when + describing the target resource. type: object arn: - description: ARN is the AWS Resource Name for the resource. It - is a globally unique identifier. + description: |- + ARN is the AWS Resource Name for the resource. It is a globally + unique identifier. type: string nameOrID: - description: NameOrId is a user-supplied string identifier for - the resource. It may or may not be globally unique, depending - on the type of resource. + description: |- + NameOrId is a user-supplied string identifier for the resource. It may + or may not be globally unique, depending on the type of resource. type: string type: object kubernetes: - description: ResourceWithMetadata provides the values necessary to - create a Kubernetes resource and override any of its metadata values. + description: |- + ResourceWithMetadata provides the values necessary to create a + Kubernetes resource and override any of its metadata values. properties: group: type: string kind: type: string metadata: - description: "ObjectMeta is metadata that all persisted resources - must have, which includes all objects users must create. It - is not possible to use `metav1.ObjectMeta` inside spec, as the - controller-gen automatically converts this to an arbitrary string-string - map. https://github.com/kubernetes-sigs/controller-tools/issues/385 - \n Active discussion about inclusion of this field in the spec - is happening in this PR: https://github.com/kubernetes-sigs/controller-tools/pull/395 - \n Until this is allowed, or if it never is, we will produce - a subset of the object meta that contains only the fields which - the user is allowed to modify in the metadata." + description: |- + ObjectMeta is metadata that all persisted resources must have, which includes all objects + users must create. + It is not possible to use `metav1.ObjectMeta` inside spec, as the controller-gen + automatically converts this to an arbitrary string-string map. + https://github.com/kubernetes-sigs/controller-tools/issues/385 + + + Active discussion about inclusion of this field in the spec is happening in this PR: + https://github.com/kubernetes-sigs/controller-tools/pull/395 + + + Until this is allowed, or if it never is, we will produce a subset of the object meta + that contains only the fields which the user is allowed to modify in the metadata. properties: annotations: additionalProperties: type: string - description: 'Annotations is an unstructured key value map - stored with a resource that may be set by external tools - to store and retrieve arbitrary metadata. They are not queryable - and should be preserved when modifying objects. More info: - http://kubernetes.io/docs/user-guide/annotations' + description: |- + Annotations is an unstructured key value map stored with a resource that may be + set by external tools to store and retrieve arbitrary metadata. They are not + queryable and should be preserved when modifying objects. + More info: http://kubernetes.io/docs/user-guide/annotations type: object generateName: - description: "GenerateName is an optional prefix, used by - the server, to generate a unique name ONLY IF the Name field - has not been provided. If this field is used, the name returned - to the client will be different than the name passed. This - value will also be combined with a unique suffix. The provided - value has the same validation rules as the Name field, and - may be truncated by the length of the suffix required to - make the value unique on the server. \n If this field is - specified and the generated name exists, the server will - NOT return a 409 - instead, it will either return 201 Created - or 500 with Reason ServerTimeout indicating a unique name - could not be found in the time allotted, and the client - should retry (optionally after the time indicated in the - Retry-After header). \n Applied only if Name is not specified. - More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency" + description: |- + GenerateName is an optional prefix, used by the server, to generate a unique + name ONLY IF the Name field has not been provided. + If this field is used, the name returned to the client will be different + than the name passed. This value will also be combined with a unique suffix. + The provided value has the same validation rules as the Name field, + and may be truncated by the length of the suffix required to make the value + unique on the server. + + + If this field is specified and the generated name exists, the server will + NOT return a 409 - instead, it will either return 201 Created or 500 with Reason + ServerTimeout indicating a unique name could not be found in the time allotted, and the client + should retry (optionally after the time indicated in the Retry-After header). + + + Applied only if Name is not specified. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency type: string labels: additionalProperties: type: string - description: 'Map of string keys and values that can be used - to organize and categorize (scope and select) objects. May - match selectors of replication controllers and services. - More info: http://kubernetes.io/docs/user-guide/labels' + description: |- + Map of string keys and values that can be used to organize and categorize + (scope and select) objects. May match selectors of replication controllers + and services. + More info: http://kubernetes.io/docs/user-guide/labels type: object name: - description: 'Name must be unique within a namespace. Is required - when creating resources, although some resources may allow - a client to request the generation of an appropriate name - automatically. Name is primarily intended for creation idempotence - and configuration definition. Cannot be updated. More info: - http://kubernetes.io/docs/user-guide/identifiers#names' + description: |- + Name must be unique within a namespace. Is required when creating resources, although + some resources may allow a client to request the generation of an appropriate name + automatically. Name is primarily intended for creation idempotence and configuration + definition. + Cannot be updated. + More info: http://kubernetes.io/docs/user-guide/identifiers#names type: string namespace: - description: "Namespace defines the space within each name - must be unique. An empty namespace is equivalent to the - \"default\" namespace, but \"default\" is the canonical - representation. Not all objects are required to be scoped - to a namespace - the value of this field for those objects - will be empty. \n Must be a DNS_LABEL. Cannot be updated. - More info: http://kubernetes.io/docs/user-guide/namespaces" + description: |- + Namespace defines the space within each name must be unique. An empty namespace is + equivalent to the "default" namespace, but "default" is the canonical representation. + Not all objects are required to be scoped to a namespace - the value of this field for + those objects will be empty. + + + Must be a DNS_LABEL. + Cannot be updated. + More info: http://kubernetes.io/docs/user-guide/namespaces type: string ownerReferences: - description: List of objects depended by this object. If ALL - objects in the list have been deleted, this object will - be garbage collected. If this object is managed by a controller, - then an entry in this list will point to this controller, - with the controller field set to true. There cannot be more - than one managing controller. + description: |- + List of objects depended by this object. If ALL objects in the list have + been deleted, this object will be garbage collected. If this object is managed by a controller, + then an entry in this list will point to this controller, with the controller field set to true. + There cannot be more than one managing controller. items: - description: OwnerReference contains enough information - to let you identify an owning object. An owning object - must be in the same namespace as the dependent, or be - cluster-scoped, so there is no namespace field. + description: |- + OwnerReference contains enough information to let you identify an owning + object. An owning object must be in the same namespace as the dependent, or + be cluster-scoped, so there is no namespace field. properties: apiVersion: description: API version of the referent. type: string blockOwnerDeletion: - description: If true, AND if the owner has the "foregroundDeletion" - finalizer, then the owner cannot be deleted from the - key-value store until this reference is removed. See - https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion - for how the garbage collector interacts with this - field and enforces the foreground deletion. Defaults - to false. To set this field, a user needs "delete" - permission of the owner, otherwise 422 (Unprocessable - Entity) will be returned. + description: |- + If true, AND if the owner has the "foregroundDeletion" finalizer, then + the owner cannot be deleted from the key-value store until this + reference is removed. + See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion + for how the garbage collector interacts with this field and enforces the foreground deletion. + Defaults to false. + To set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. type: boolean controller: description: If true, this reference points to the managing controller. type: boolean kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names type: string uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#uids type: string required: - apiVersion @@ -188,13 +212,14 @@ spec: AdoptedResource. properties: conditions: - description: A collection of `ackv1alpha1.Condition` objects that - describe the various terminal states of the adopted resource CR - and its target custom resource + description: |- + A collection of `ackv1alpha1.Condition` objects that describe the various + terminal states of the adopted resource CR and its target custom 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 + 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 diff --git a/helm/crds/services.k8s.aws_fieldexports.yaml b/helm/crds/services.k8s.aws_fieldexports.yaml index 4a7ab61..4d3a8f1 100644 --- a/helm/crds/services.k8s.aws_fieldexports.yaml +++ b/helm/crds/services.k8s.aws_fieldexports.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: fieldexports.services.k8s.aws spec: group: services.k8s.aws @@ -21,14 +20,19 @@ spec: description: FieldExport is the schema for the FieldExport 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' + 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' + 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 @@ -36,15 +40,17 @@ spec: description: FieldExportSpec defines the desired state of the FieldExport. properties: from: - description: ResourceFieldSelector provides the values necessary to - identify an individual field on an individual K8s resource. + description: |- + ResourceFieldSelector provides the values necessary to identify an individual + field on an individual K8s resource. properties: path: type: string resource: - description: NamespacedResource provides all the values necessary - to identify an ACK resource of a given type (within the same - namespace as the custom resource containing this type). + description: |- + NamespacedResource provides all the values necessary to identify an ACK + resource of a given type (within the same namespace as the custom resource + containing this type). properties: group: type: string @@ -62,16 +68,18 @@ spec: - resource type: object to: - description: FieldExportTarget provides the values necessary to identify - the output path for a field export. + description: |- + FieldExportTarget provides the values necessary to identify the + output path for a field export. properties: key: description: Key overrides the default value (`.`) for the FieldExport target type: string kind: - description: FieldExportOutputType represents all types that can - be produced by a field export operation + description: |- + FieldExportOutputType represents all types that can be produced by a field + export operation enum: - configmap - secret @@ -94,12 +102,14 @@ spec: description: FieldExportStatus defines the observed status of the FieldExport. properties: conditions: - description: A collection of `ackv1alpha1.Condition` objects that - describe the various recoverable states of the field CR + description: |- + A collection of `ackv1alpha1.Condition` objects that describe the various + recoverable states of the field CR 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 + 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 diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index 3688456..457ecd3 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/networkfirewall-controller:0.0.1". +This chart deploys "public.ecr.aws/aws-controllers-k8s/networkfirewall-controller:0.0.2". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 9ee71dd..c2ea73d 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{/* The name of the application this chart installs */}} -{{- define "app.name" -}} +{{- define "ack-networkfirewall-controller.app.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -8,7 +8,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "app.fullname" -}} +{{- define "ack-networkfirewall-controller.app.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -22,33 +22,33 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{/* The name and version as used by the chart label */}} -{{- define "chart.name-version" -}} +{{- define "ack-networkfirewall-controller.chart.name-version" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* The name of the service account to use */}} -{{- define "service-account.name" -}} +{{- define "ack-networkfirewall-controller.service-account.name" -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} -{{- define "watch-namespace" -}} +{{- define "ack-networkfirewall-controller.watch-namespace" -}} {{- if eq .Values.installScope "namespace" -}} {{ .Values.watchNamespace | default .Release.Namespace }} {{- end -}} {{- end -}} {{/* The mount path for the shared credentials file */}} -{{- define "aws.credentials.secret_mount_path" -}} +{{- define "ack-networkfirewall-controller.aws.credentials.secret_mount_path" -}} {{- "/var/run/secrets/aws" -}} {{- end -}} {{/* The path the shared credentials file is mounted */}} -{{- define "aws.credentials.path" -}} +{{- define "ack-networkfirewall-controller.aws.credentials.path" -}} {{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}} {{- end -}} {{/* The rules a of ClusterRole or Role */}} -{{- define "controller-role-rules" }} +{{- define "ack-networkfirewall-controller.rbac-rules" -}} rules: - apiGroups: - "" diff --git a/helm/templates/cluster-role-binding.yaml b/helm/templates/cluster-role-binding.yaml index bd02718..879f2cd 100644 --- a/helm/templates/cluster-role-binding.yaml +++ b/helm/templates/cluster-role-binding.yaml @@ -2,20 +2,21 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "app.fullname" . }} + name: {{ include "ack-networkfirewall-controller.app.fullname" . }} roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io name: ack-networkfirewall-controller subjects: - kind: ServiceAccount - name: {{ include "service-account.name" . }} + name: {{ include "ack-networkfirewall-controller.service-account.name" . }} namespace: {{ .Release.Namespace }} -{{ else if .Values.watchNamespace }} -{{ $namespaces := split "," .Values.watchNamespace }} -{{ $fullname := include "app.fullname" . }} +{{ else if eq .Values.installScope "namespace" }} +{{ $wn := include "ack-networkfirewall-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} +{{ $fullname := include "ack-networkfirewall-controller.app.fullname" . }} {{ $releaseNamespace := .Release.Namespace }} -{{ $serviceAccountName := include "service-account.name" . }} +{{ $serviceAccountName := include "ack-networkfirewall-controller.service-account.name" . }} {{ range $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml index c1bb7cb..6afd654 100644 --- a/helm/templates/cluster-role-controller.yaml +++ b/helm/templates/cluster-role-controller.yaml @@ -1,5 +1,5 @@ {{ $labels := .Values.role.labels }} -{{ $rules := include "controller-role-rules" . }} +{{ $rbacRules := include "ack-networkfirewall-controller.rbac-rules" . }} {{ if eq .Values.installScope "cluster" }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -9,9 +9,10 @@ metadata: {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} -{{- $rules }} -{{ else if .Values.watchNamespace }} -{{ $namespaces := split "," .Values.watchNamespace }} +{{$rbacRules }} +{{ else if eq .Values.installScope "namespace" }} +{{ $wn := include "ack-networkfirewall-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} {{ range $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -23,6 +24,6 @@ metadata: {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} -{{- $rules }} +{{ $rbacRules }} {{ end }} {{ end }} \ No newline at end of file diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index cea38ec..7eb20f3 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "app.fullname" . }} + name: {{ include "ack-networkfirewall-controller.app.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} - k8s-app: {{ include "app.name" . }} - helm.sh/chart: {{ include "chart.name-version" . }} + k8s-app: {{ include "ack-networkfirewall-controller.app.name" . }} + helm.sh/chart: {{ include "ack-networkfirewall-controller.chart.name-version" . }} spec: replicas: {{ .Values.deployment.replicas }} selector: matchLabels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: @@ -25,15 +25,15 @@ spec: {{- end }} {{- end }} labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-networkfirewall-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} spec: - serviceAccountName: {{ include "service-account.name" . }} + serviceAccountName: {{ include "ack-networkfirewall-controller.service-account.name" . }} {{- if .Values.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} @@ -90,7 +90,7 @@ spec: - name: AWS_ENDPOINT_URL value: {{ .Values.aws.endpoint_url | quote }} - name: ACK_WATCH_NAMESPACE - value: {{ include "watch-namespace" . }} + value: {{ include "ack-networkfirewall-controller.watch-namespace" . }} - name: DELETION_POLICY value: {{ .Values.deletionPolicy }} - name: LEADER_ELECTION_NAMESPACE @@ -109,7 +109,7 @@ spec: {{- end }} {{- if .Values.aws.credentials.secretName }} - name: AWS_SHARED_CREDENTIALS_FILE - value: {{ include "aws.credentials.path" . }} + value: {{ include "ack-networkfirewall-controller.aws.credentials.path" . }} - name: AWS_PROFILE value: {{ .Values.aws.credentials.profile }} {{- end }} @@ -119,7 +119,7 @@ spec: volumeMounts: {{- if .Values.aws.credentials.secretName }} - name: {{ .Values.aws.credentials.secretName }} - mountPath: {{ include "aws.credentials.secret_mount_path" . }} + mountPath: {{ include "ack-networkfirewall-controller.aws.credentials.secret_mount_path" . }} readOnly: true {{- end }} {{- if .Values.deployment.extraVolumeMounts -}} diff --git a/helm/templates/leader-election-role-binding.yaml b/helm/templates/leader-election-role-binding.yaml index 7e89b2b..337402c 100644 --- a/helm/templates/leader-election-role-binding.yaml +++ b/helm/templates/leader-election-role-binding.yaml @@ -14,5 +14,5 @@ roleRef: name: networkfirewall-leader-election-role subjects: - kind: ServiceAccount - name: {{ include "service-account.name" . }} + name: {{ include "ack-networkfirewall-controller.service-account.name" . }} namespace: {{ .Release.Namespace }}{{- end }} diff --git a/helm/templates/metrics-service.yaml b/helm/templates/metrics-service.yaml index 638858a..388eb72 100644 --- a/helm/templates/metrics-service.yaml +++ b/helm/templates/metrics-service.yaml @@ -5,18 +5,18 @@ metadata: name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} - k8s-app: {{ include "app.name" . }} - helm.sh/chart: {{ include "chart.name-version" . }} + k8s-app: {{ include "ack-networkfirewall-controller.app.name" . }} + helm.sh/chart: {{ include "ack-networkfirewall-controller.chart.name-version" . }} spec: selector: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-networkfirewall-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/helm/templates/service-account.yaml b/helm/templates/service-account.yaml index 7330639..f7fbf4a 100644 --- a/helm/templates/service-account.yaml +++ b/helm/templates/service-account.yaml @@ -3,13 +3,13 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-networkfirewall-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} - k8s-app: {{ include "app.name" . }} - helm.sh/chart: {{ include "chart.name-version" . }} - name: {{ include "service-account.name" . }} + k8s-app: {{ include "ack-networkfirewall-controller.app.name" . }} + helm.sh/chart: {{ include "ack-networkfirewall-controller.chart.name-version" . }} + name: {{ include "ack-networkfirewall-controller.service-account.name" . }} namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := .Values.serviceAccount.annotations }} diff --git a/helm/values.yaml b/helm/values.yaml index 995604c..f4225fc 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/networkfirewall-controller - tag: 0.0.1 + tag: 0.0.2 pullPolicy: IfNotPresent pullSecrets: []