diff --git a/addons/pipes-chart/Chart.yaml b/addons/pipes-chart/Chart.yaml index e19d5947f..081b97adc 100644 --- a/addons/pipes-chart/Chart.yaml +++ b/addons/pipes-chart/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: pipes-chart description: A Helm chart for the ACK service controller for Amazon EventBridge Pipes (Pipes) -version: 1.0.3 -appVersion: 1.0.3 +version: 1.0.12 +appVersion: 1.0.12 home: https://github.com/aws-controllers-k8s/pipes-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/addons/pipes-chart/crds/pipes.services.k8s.aws_pipes.yaml b/addons/pipes-chart/crds/pipes.services.k8s.aws_pipes.yaml index ed564a7c8..1dde95e69 100644 --- a/addons/pipes-chart/crds/pipes.services.k8s.aws_pipes.yaml +++ b/addons/pipes-chart/crds/pipes.services.k8s.aws_pipes.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: pipes.pipes.services.k8s.aws spec: group: pipes.services.k8s.aws @@ -43,22 +42,29 @@ spec: description: Pipe is the Schema for the Pipes 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: "PipeSpec defines the desired state of Pipe. \n An object - that represents a pipe. Amazon EventBridgePipes connect event sources + description: |- + PipeSpec defines the desired state of Pipe. + + An object that represents a pipe. Amazon EventBridgePipes connect event sources to targets and reduces the need for specialized knowledge and integration - code." + code. properties: description: description: A description of the pipe. @@ -74,11 +80,11 @@ spec: pipe. properties: httpParameters: - description: These are custom parameter to be used when the target - is an API Gateway REST APIs or EventBridge ApiDestinations. - In the latter case, these are merged with any InvocationParameters - specified on the Connection, with any values from the Connection - taking precedence. + description: |- + These are custom parameter to be used when the target is an API Gateway REST + APIs or EventBridge ApiDestinations. In the latter case, these are merged + with any InvocationParameters specified on the Connection, with any values + from the Connection taking precedence. properties: headerParameters: additionalProperties: @@ -138,8 +144,9 @@ spec: format: int64 type: integer deadLetterConfig: - description: A DeadLetterConfig object that contains information - about a dead-letter queue configuration. + description: |- + A DeadLetterConfig object that contains information about a dead-letter queue + configuration. properties: arn: type: string @@ -162,14 +169,16 @@ spec: type: string type: object filterCriteria: - description: The collection of event patterns used to filter events. - For more information, see Events and Event Patterns (https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html) + description: |- + The collection of event patterns used to filter events. For more information, + see Events and Event Patterns (https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html) in the Amazon EventBridge User Guide. properties: filters: items: - description: Filter events using an event pattern. For more - information, see Events and Event Patterns (https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html) + description: |- + Filter events using an event pattern. For more information, see Events and + Event Patterns (https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html) in the Amazon EventBridge User Guide. properties: pattern: @@ -184,8 +193,9 @@ spec: format: int64 type: integer deadLetterConfig: - description: A DeadLetterConfig object that contains information - about a dead-letter queue configuration. + description: |- + A DeadLetterConfig object that contains information about a dead-letter queue + configuration. properties: arn: type: string @@ -309,9 +319,9 @@ spec: topicName: type: string vpc: - description: This structure specifies the VPC subnets and - security groups for the stream, and whether a public IP - address is to be used. + description: |- + This structure specifies the VPC subnets and security groups for the stream, + and whether a public IP address is to be used. properties: securityGroup: description: List of SecurityGroupId. @@ -352,11 +362,11 @@ spec: description: The parameters for using an Batch job as a target. properties: arrayProperties: - description: The array properties for the submitted job, such - as the size of the array. The array size can be between - 2 and 10,000. If you specify array properties for a job, - it becomes an array job. This parameter is used only if - the target is an Batch job. + description: |- + The array properties for the submitted job, such as the size of the array. + The array size can be between 2 and 10,000. If you specify array properties + for a job, it becomes an array job. This parameter is used only if the target + is an Batch job. properties: size: format: int64 @@ -371,13 +381,13 @@ spec: type: array environment: items: - description: "The environment variables to send to the - container. You can add new environment variables, - which are added to the container at launch, or you - can override the existing environment variables from - the Docker image or the task definition. \n Environment - variables cannot start with \"Batch\". This naming - convention is reserved for variables that Batch sets." + description: |- + The environment variables to send to the container. You can add new environment + variables, which are added to the container at launch, or you can override + the existing environment variables from the Docker image or the task definition. + + Environment variables cannot start with "Batch". This naming convention is + reserved for variables that Batch sets. properties: name: type: string @@ -389,9 +399,9 @@ spec: type: string resourceRequirements: items: - description: The type and amount of a resource to assign - to a container. The supported resources include GPU, - MEMORY, and VCPU. + description: |- + The type and amount of a resource to assign to a container. The supported + resources include GPU, MEMORY, and VCPU. properties: type_: type: string @@ -419,8 +429,9 @@ spec: type: string type: object retryStrategy: - description: The retry strategy that's associated with a job. - For more information, see Automated job retries (https://docs.aws.amazon.com/batch/latest/userguide/job_retries.html) + description: |- + The retry strategy that's associated with a job. For more information, see + Automated job retries (https://docs.aws.amazon.com/batch/latest/userguide/job_retries.html) in the Batch User Guide. properties: attempts: @@ -443,8 +454,9 @@ spec: properties: capacityProviderStrategy: items: - description: The details of a capacity provider strategy. - To learn more, see CapacityProviderStrategyItem (https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CapacityProviderStrategyItem.html) + description: |- + The details of a capacity provider strategy. To learn more, see CapacityProviderStrategyItem + (https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CapacityProviderStrategyItem.html) in the Amazon ECS API Reference. properties: base: @@ -470,9 +482,9 @@ spec: for an Amazon ECS task. properties: awsVPCConfiguration: - description: This structure specifies the VPC subnets - and security groups for the task, and whether a public - IP address is to be used. This structure is relevant + description: |- + This structure specifies the VPC subnets and security groups for the task, + and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the awsvpc network mode. properties: assignPublicIP: @@ -492,11 +504,11 @@ spec: properties: containerOverrides: items: - description: 'The overrides that are sent to a container. - An empty container override can be passed in. An example - of an empty container override is {"containerOverrides": - [ ] }. If a non-empty container override is specified, - the name parameter must be included.' + description: |- + The overrides that are sent to a container. An empty container override can + be passed in. An example of an empty container override is {"containerOverrides": + [ ] }. If a non-empty container override is specified, the name parameter + must be included. properties: command: items: @@ -507,13 +519,11 @@ spec: type: integer environment: items: - description: The environment variables to send - to the container. You can add new environment - variables, which are added to the container - at launch, or you can override the existing - environment variables from the Docker image - or the task definition. You must also specify - a container name. + description: |- + The environment variables to send to the container. You can add new environment + variables, which are added to the container at launch, or you can override + the existing environment variables from the Docker image or the task definition. + You must also specify a container name. properties: name: type: string @@ -523,31 +533,28 @@ spec: type: array environmentFiles: items: - description: "A list of files containing the environment - variables to pass to a container. You can specify - up to ten environment files. The file must have - a .env file extension. Each line in an environment - file should contain an environment variable - in VARIABLE=VALUE format. Lines beginning with - # are treated as comments and are ignored. For - more information about the environment variable - file syntax, see Declare default environment - variables in file (https://docs.docker.com/compose/env-file/). - \n If there are environment variables specified - using the environment parameter in a container - definition, they take precedence over the variables - contained within an environment file. If multiple - environment files are specified that contain - the same variable, they're processed from the - top down. We recommend that you use unique variable - names. For more information, see Specifying + description: |- + A list of files containing the environment variables to pass to a container. + You can specify up to ten environment files. The file must have a .env file + extension. Each line in an environment file should contain an environment + variable in VARIABLE=VALUE format. Lines beginning with # are treated as + comments and are ignored. For more information about the environment variable + file syntax, see Declare default environment variables in file (https://docs.docker.com/compose/env-file/). + + If there are environment variables specified using the environment parameter + in a container definition, they take precedence over the variables contained + within an environment file. If multiple environment files are specified that + contain the same variable, they're processed from the top down. We recommend + that you use unique variable names. For more information, see Specifying environment variables (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/taskdef-envfiles.html) - in the Amazon Elastic Container Service Developer - Guide. \n This parameter is only supported for - tasks hosted on Fargate using the following - platform versions: \n - Linux platform version - 1.4.0 or later. \n - Windows platform version - 1.0.0 or later." + in the Amazon Elastic Container Service Developer Guide. + + This parameter is only supported for tasks hosted on Fargate using the following + platform versions: + + - Linux platform version 1.4.0 or later. + + - Windows platform version 1.0.0 or later. properties: type_: type: string @@ -565,15 +572,12 @@ spec: type: string resourceRequirements: items: - description: The type and amount of a resource - to assign to a container. The supported resource - types are GPUs and Elastic Inference accelerators. - For more information, see Working with GPUs - on Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-gpu.html) - or Working with Amazon Elastic Inference on - Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-inference.html) - in the Amazon Elastic Container Service Developer - Guide + description: |- + The type and amount of a resource to assign to a container. The supported + resource types are GPUs and Elastic Inference accelerators. For more information, + see Working with GPUs on Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-gpu.html) + or Working with Amazon Elastic Inference on Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-inference.html) + in the Amazon Elastic Container Service Developer Guide properties: type_: type: string @@ -586,15 +590,16 @@ spec: cpu: type: string ephemeralStorage: - description: "The amount of ephemeral storage to allocate - for the task. This parameter is used to expand the total - amount of ephemeral storage available, beyond the default - amount, for tasks hosted on Fargate. For more information, - see Fargate task storage (https://docs.aws.amazon.com/AmazonECS/latest/userguide/using_data_volumes.html) - in the Amazon ECS User Guide for Fargate. \n This parameter - is only supported for tasks hosted on Fargate using - Linux platform version 1.4.0 or later. This parameter - is not supported for Windows containers on Fargate." + description: |- + The amount of ephemeral storage to allocate for the task. This parameter + is used to expand the total amount of ephemeral storage available, beyond + the default amount, for tasks hosted on Fargate. For more information, see + Fargate task storage (https://docs.aws.amazon.com/AmazonECS/latest/userguide/using_data_volumes.html) + in the Amazon ECS User Guide for Fargate. + + This parameter is only supported for tasks hosted on Fargate using Linux + platform version 1.4.0 or later. This parameter is not supported for Windows + containers on Fargate. properties: sizeInGiB: format: int64 @@ -604,13 +609,12 @@ spec: type: string inferenceAcceleratorOverrides: items: - description: Details on an Elastic Inference accelerator - task override. This parameter is used to override - the Elastic Inference accelerator specified in the - task definition. For more information, see Working - with Amazon Elastic Inference on Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/userguide/ecs-inference.html) - in the Amazon Elastic Container Service Developer - Guide. + description: |- + Details on an Elastic Inference accelerator task override. This parameter + is used to override the Elastic Inference accelerator specified in the task + definition. For more information, see Working with Amazon Elastic Inference + on Amazon ECS (https://docs.aws.amazon.com/AmazonECS/latest/userguide/ecs-inference.html) + in the Amazon Elastic Container Service Developer Guide. properties: deviceName: type: string @@ -625,9 +629,9 @@ spec: type: object placementConstraints: items: - description: An object representing a constraint on task - placement. To learn more, see Task Placement Constraints - (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-constraints.html) + description: |- + An object representing a constraint on task placement. To learn more, see + Task Placement Constraints (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-constraints.html) in the Amazon Elastic Container Service Developer Guide. properties: expression: @@ -638,10 +642,10 @@ spec: type: array placementStrategy: items: - description: The task placement strategy for a task or service. - To learn more, see Task Placement Strategies (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-strategies.html) - in the Amazon Elastic Container Service Service Developer - Guide. + description: |- + The task placement strategy for a task or service. To learn more, see Task + Placement Strategies (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-strategies.html) + in the Amazon Elastic Container Service Service Developer Guide. properties: field: type: string @@ -657,9 +661,9 @@ spec: type: string tags: items: - description: A key-value pair associated with an Amazon - Web Services resource. In EventBridge, rules and event - buses support tagging. + description: |- + A key-value pair associated with an Amazon Web Services resource. In EventBridge, + rules and event buses support tagging. properties: key: type: string @@ -691,8 +695,9 @@ spec: type: string type: object httpParameters: - description: These are custom parameter to be used when the target - is an API Gateway REST APIs or EventBridge ApiDestinations. + description: |- + These are custom parameter to be used when the target is an API Gateway REST + APIs or EventBridge ApiDestinations. properties: headerParameters: additionalProperties: @@ -722,9 +727,9 @@ spec: type: string type: object redshiftDataParameters: - description: These are custom parameters to be used when the target - is a Amazon Redshift cluster to invoke the Amazon Redshift Data - API ExecuteStatement. + description: |- + These are custom parameters to be used when the target is a Amazon Redshift + cluster to invoke the Amazon Redshift Data API ExecuteStatement. properties: database: description: // Redshift Database @@ -742,8 +747,9 @@ spec: type: string type: array statementName: - description: // A name for Redshift DataAPI statement which - can be used as filter of // ListStatement. + description: |- + // A name for Redshift DataAPI statement which can be used as filter of // + ListStatement. type: string withEvent: type: boolean @@ -754,8 +760,9 @@ spec: properties: pipelineParameterList: items: - description: Name/Value pair of a parameter to start execution - of a SageMaker Model Building Pipeline. + description: |- + Name/Value pair of a parameter to start execution of a SageMaker Model Building + Pipeline. properties: name: type: string @@ -791,24 +798,25 @@ spec: description: PipeStatus defines the observed state of Pipe 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 @@ -819,14 +827,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 @@ -859,7 +869,8 @@ spec: description: The state the pipe is in. type: string lastModifiedTime: - description: When the pipe was last updated, in ISO-8601 format (https://www.w3.org/TR/NOTE-datetime) + description: |- + When the pipe was last updated, in ISO-8601 format (https://www.w3.org/TR/NOTE-datetime) (YYYY-MM-DDThh:mm:ss.sTZD). format: date-time type: string diff --git a/addons/pipes-chart/crds/services.k8s.aws_adoptedresources.yaml b/addons/pipes-chart/crds/services.k8s.aws_adoptedresources.yaml index d8d512618..b7be3224f 100644 --- a/addons/pipes-chart/crds/services.k8s.aws_adoptedresources.yaml +++ b/addons/pipes-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/pipes-chart/crds/services.k8s.aws_fieldexports.yaml b/addons/pipes-chart/crds/services.k8s.aws_fieldexports.yaml index 4a7ab61b3..49b4f3834 100644 --- a/addons/pipes-chart/crds/services.k8s.aws_fieldexports.yaml +++ b/addons/pipes-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/pipes-chart/templates/NOTES.txt b/addons/pipes-chart/templates/NOTES.txt index 487fd768e..25e25a295 100644 --- a/addons/pipes-chart/templates/NOTES.txt +++ b/addons/pipes-chart/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/pipes-controller:1.0.3". +This chart deploys "public.ecr.aws/aws-controllers-k8s/pipes-controller:1.0.12". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/addons/pipes-chart/templates/_helpers.tpl b/addons/pipes-chart/templates/_helpers.tpl index 391d5de33..229797351 100644 --- a/addons/pipes-chart/templates/_helpers.tpl +++ b/addons/pipes-chart/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{/* The name of the application this chart installs */}} -{{- define "app.name" -}} +{{- define "ack-pipes-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-pipes-controller.app.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -22,27 +22,102 @@ 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-pipes-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-pipes-controller.service-account.name" -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} -{{- define "watch-namespace" -}} +{{- define "ack-pipes-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-pipes-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-pipes-controller.aws.credentials.path" -}} +{{ $secret_mount_path := include "ack-pipes-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-pipes-controller.rbac-rules" -}} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + verbs: + - get + - list + - patch + - watch +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch +- apiGroups: + - pipes.services.k8s.aws + resources: + - pipes + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - pipes.services.k8s.aws + resources: + - pipes/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 +{{- end }} + +{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}} +{{- define "ack-pipes-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/pipes-chart/templates/caches-role-binding.yaml b/addons/pipes-chart/templates/caches-role-binding.yaml new file mode 100644 index 000000000..ddb833977 --- /dev/null +++ b/addons/pipes-chart/templates/caches-role-binding.yaml @@ -0,0 +1,26 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: ack-namespaces-cache-pipes-controller +roleRef: + kind: ClusterRole + apiGroup: rbac.authorization.k8s.io + name: ack-namespaces-cache-pipes-controller +subjects: +- kind: ServiceAccount + name: ack-pipes-controller + namespace: {{ .Release.Namespace }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: ack-configmaps-cache-pipes-controller + namespace: {{ .Release.Namespace }} +roleRef: + kind: Role + apiGroup: rbac.authorization.k8s.io + name: ack-configmaps-cache-pipes-controller +subjects: +- kind: ServiceAccount + name: ack-pipes-controller + namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/addons/pipes-chart/templates/caches-role.yaml b/addons/pipes-chart/templates/caches-role.yaml new file mode 100644 index 000000000..a1ac454e8 --- /dev/null +++ b/addons/pipes-chart/templates/caches-role.yaml @@ -0,0 +1,28 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: ack-namespaces-cache-pipes-controller +rules: +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: ack-configmaps-cache-pipes-controller + namespace: {{ .Release.Namespace }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch \ No newline at end of file diff --git a/addons/pipes-chart/templates/cluster-role-binding.yaml b/addons/pipes-chart/templates/cluster-role-binding.yaml index 78bb5f08a..f2c6931a7 100644 --- a/addons/pipes-chart/templates/cluster-role-binding.yaml +++ b/addons/pipes-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-pipes-controller.app.fullname" . }} roleRef: kind: ClusterRole -{{ else }} + apiGroup: rbac.authorization.k8s.io + name: ack-pipes-controller +subjects: +- kind: ServiceAccount + name: {{ include "ack-pipes-controller.service-account.name" . }} + namespace: {{ .Release.Namespace }} +{{ else if eq .Values.installScope "namespace" }} +{{ $wn := include "ack-pipes-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} +{{ $fullname := include "ack-pipes-controller.app.fullname" . }} +{{ $releaseNamespace := .Release.Namespace }} +{{ $serviceAccountName := include "ack-pipes-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-pipes-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/pipes-chart/templates/cluster-role-controller.yaml b/addons/pipes-chart/templates/cluster-role-controller.yaml index 3d6ea1bd9..05765958b 100644 --- a/addons/pipes-chart/templates/cluster-role-controller.yaml +++ b/addons/pipes-chart/templates/cluster-role-controller.yaml @@ -1,108 +1,29 @@ -apiVersion: rbac.authorization.k8s.io/v1 +{{ $labels := .Values.role.labels }} +{{ $rbacRules := include "ack-pipes-controller.rbac-rules" . }} {{ if eq .Values.installScope "cluster" }} +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: ack-pipes-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-pipes-controller.watch-namespace" . }} +{{ $namespaces := split "," $wn }} +{{ range $namespaces }} +--- +apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - creationTimestamp: null name: ack-pipes-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: - - pipes.services.k8s.aws - resources: - - pipes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - pipes.services.k8s.aws - resources: - - pipes/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 +{{ end }} \ No newline at end of file diff --git a/addons/pipes-chart/templates/deployment.yaml b/addons/pipes-chart/templates/deployment.yaml index cea38ec98..547888e67 100644 --- a/addons/pipes-chart/templates/deployment.yaml +++ b/addons/pipes-chart/templates/deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "app.fullname" . }} + name: {{ include "ack-pipes-controller.app.fullname" . }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-pipes-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-pipes-controller.app.name" . }} + helm.sh/chart: {{ include "ack-pipes-controller.chart.name-version" . }} spec: replicas: {{ .Values.deployment.replicas }} selector: matchLabels: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-pipes-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-pipes-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-pipes-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} spec: - serviceAccountName: {{ include "service-account.name" . }} + serviceAccountName: {{ include "ack-pipes-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-pipes-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-pipes-controller.feature-gates" . }} {{- end }} {{- if .Values.aws.credentials.secretName }} - name: AWS_SHARED_CREDENTIALS_FILE - value: {{ include "aws.credentials.path" . }} + value: {{ include "ack-pipes-controller.aws.credentials.path" . }} - name: AWS_PROFILE value: {{ .Values.aws.credentials.profile }} {{- end }} @@ -119,7 +143,7 @@ spec: volumeMounts: {{- if .Values.aws.credentials.secretName }} - name: {{ .Values.aws.credentials.secretName }} - mountPath: {{ include "aws.credentials.secret_mount_path" . }} + mountPath: {{ include "ack-pipes-controller.aws.credentials.secret_mount_path" . }} readOnly: true {{- end }} {{- if .Values.deployment.extraVolumeMounts -}} @@ -128,10 +152,23 @@ spec: 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 diff --git a/addons/pipes-chart/templates/leader-election-role-binding.yaml b/addons/pipes-chart/templates/leader-election-role-binding.yaml index ffdb6916a..c692e0f3f 100644 --- a/addons/pipes-chart/templates/leader-election-role-binding.yaml +++ b/addons/pipes-chart/templates/leader-election-role-binding.yaml @@ -14,5 +14,5 @@ roleRef: name: pipes-leader-election-role subjects: - kind: ServiceAccount - name: {{ include "service-account.name" . }} + name: {{ include "ack-pipes-controller.service-account.name" . }} namespace: {{ .Release.Namespace }}{{- end }} diff --git a/addons/pipes-chart/templates/metrics-service.yaml b/addons/pipes-chart/templates/metrics-service.yaml index 638858a38..f42dc558e 100644 --- a/addons/pipes-chart/templates/metrics-service.yaml +++ b/addons/pipes-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-pipes-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-pipes-controller.app.name" . }} + helm.sh/chart: {{ include "ack-pipes-controller.chart.name-version" . }} spec: selector: - app.kubernetes.io/name: {{ include "app.name" . }} + app.kubernetes.io/name: {{ include "ack-pipes-controller.app.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm - k8s-app: {{ include "app.name" . }} + k8s-app: {{ include "ack-pipes-controller.app.name" . }} {{- range $key, $value := .Values.deployment.labels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/addons/pipes-chart/templates/role-writer.yaml b/addons/pipes-chart/templates/role-writer.yaml index 7c232ca64..ebc693d2a 100644 --- a/addons/pipes-chart/templates/role-writer.yaml +++ b/addons/pipes-chart/templates/role-writer.yaml @@ -10,7 +10,6 @@ rules: - pipes.services.k8s.aws resources: - pipes - verbs: - create - delete diff --git a/addons/pipes-chart/templates/service-account.yaml b/addons/pipes-chart/templates/service-account.yaml index 73306395f..62accc9df 100644 --- a/addons/pipes-chart/templates/service-account.yaml +++ b/addons/pipes-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-pipes-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-pipes-controller.app.name" . }} + helm.sh/chart: {{ include "ack-pipes-controller.chart.name-version" . }} + name: {{ include "ack-pipes-controller.service-account.name" . }} namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := .Values.serviceAccount.annotations }} diff --git a/addons/pipes-chart/values.schema.json b/addons/pipes-chart/values.schema.json index ac28b6808..7ccb485d8 100644 --- a/addons/pipes-chart/values.schema.json +++ b/addons/pipes-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/pipes-chart/values.yaml b/addons/pipes-chart/values.yaml index 08c760ce4..e9855d8c6 100644 --- a/addons/pipes-chart/values.yaml +++ b/addons/pipes-chart/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/pipes-controller - tag: 1.0.3 + tag: 1.0.12 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,14 @@ 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 \ No newline at end of file