Skip to content

Commit a5910a5

Browse files
yosefmihyosefmih
authored
[create-pull-request] automated change
1 parent ba4fd97 commit a5910a5

20 files changed

+1099
-609
lines changed

‎addons/applicationautoscaling-chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: applicationautoscaling-chart
33
description: A Helm chart for the ACK service controller for AWS Auto Scaling (AutoScaling)
4-
version: 1.0.8
5-
appVersion: 1.0.8
4+
version: 1.1.0
5+
appVersion: 1.1.0
66
home: https://github.com/aws-controllers-k8s/applicationautoscaling-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎addons/applicationautoscaling-chart/crds/applicationautoscaling.services.k8s.aws_scalabletargets.yaml‎

Lines changed: 259 additions & 150 deletions
Large diffs are not rendered by default.

‎addons/applicationautoscaling-chart/crds/applicationautoscaling.services.k8s.aws_scalingpolicies.yaml‎

Lines changed: 279 additions & 170 deletions
Large diffs are not rendered by default.

‎addons/applicationautoscaling-chart/crds/services.k8s.aws_adoptedresources.yaml‎

Lines changed: 112 additions & 92 deletions
Large diffs are not rendered by default.

‎addons/applicationautoscaling-chart/crds/services.k8s.aws_fieldexports.yaml‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.2
87
name: fieldexports.services.k8s.aws
98
spec:
109
group: services.k8s.aws
@@ -21,30 +20,37 @@ spec:
2120
description: FieldExport is the schema for the FieldExport API.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
3539
spec:
3640
description: FieldExportSpec defines the desired state of the FieldExport.
3741
properties:
3842
from:
39-
description: ResourceFieldSelector provides the values necessary to
40-
identify an individual field on an individual K8s resource.
43+
description: |-
44+
ResourceFieldSelector provides the values necessary to identify an individual
45+
field on an individual K8s resource.
4146
properties:
4247
path:
4348
type: string
4449
resource:
45-
description: NamespacedResource provides all the values necessary
46-
to identify an ACK resource of a given type (within the same
47-
namespace as the custom resource containing this type).
50+
description: |-
51+
NamespacedResource provides all the values necessary to identify an ACK
52+
resource of a given type (within the same namespace as the custom resource
53+
containing this type).
4854
properties:
4955
group:
5056
type: string
@@ -62,16 +68,18 @@ spec:
6268
- resource
6369
type: object
6470
to:
65-
description: FieldExportTarget provides the values necessary to identify
66-
the output path for a field export.
71+
description: |-
72+
FieldExportTarget provides the values necessary to identify the
73+
output path for a field export.
6774
properties:
6875
key:
6976
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
7077
for the FieldExport target
7178
type: string
7279
kind:
73-
description: FieldExportOutputType represents all types that can
74-
be produced by a field export operation
80+
description: |-
81+
FieldExportOutputType represents all types that can be produced by a field
82+
export operation
7583
enum:
7684
- configmap
7785
- secret
@@ -94,12 +102,14 @@ spec:
94102
description: FieldExportStatus defines the observed status of the FieldExport.
95103
properties:
96104
conditions:
97-
description: A collection of `ackv1alpha1.Condition` objects that
98-
describe the various recoverable states of the field CR
105+
description: |-
106+
A collection of `ackv1alpha1.Condition` objects that describe the various
107+
recoverable states of the field CR
99108
items:
100-
description: Condition is the common struct used by all CRDs managed
101-
by ACK service controllers to indicate terminal states of the
102-
CR and its backend AWS service API resource
109+
description: |-
110+
Condition is the common struct used by all CRDs managed by ACK service
111+
controllers to indicate terminal states of the CR and its backend AWS
112+
service API resource
103113
properties:
104114
lastTransitionTime:
105115
description: Last time the condition transitioned from one status

‎addons/applicationautoscaling-chart/templates/NOTES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/applicationautoscaling-controller:1.0.8".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/applicationautoscaling-controller:1.1.0".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎addons/applicationautoscaling-chart/templates/_helpers.tpl‎

Lines changed: 85 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{/* The name of the application this chart installs */}}
2-
{{- define "app.name" -}}
2+
{{- define "ack-applicationautoscaling-controller.app.name" -}}
33
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
44
{{- end -}}
55

@@ -8,7 +8,7 @@ Create a default fully qualified app name.
88
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
99
If release name contains chart name it will be used as a full name.
1010
*/}}
11-
{{- define "app.fullname" -}}
11+
{{- define "ack-applicationautoscaling-controller.app.fullname" -}}
1212
{{- if .Values.fullnameOverride -}}
1313
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
1414
{{- else -}}
@@ -22,27 +22,104 @@ If release name contains chart name it will be used as a full name.
2222
{{- end -}}
2323

2424
{{/* The name and version as used by the chart label */}}
25-
{{- define "chart.name-version" -}}
25+
{{- define "ack-applicationautoscaling-controller.chart.name-version" -}}
2626
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
2727
{{- end -}}
2828

2929
{{/* The name of the service account to use */}}
30-
{{- define "service-account.name" -}}
30+
{{- define "ack-applicationautoscaling-controller.service-account.name" -}}
3131
{{ default "default" .Values.serviceAccount.name }}
3232
{{- end -}}
3333

34-
{{- define "watch-namespace" -}}
34+
{{- define "ack-applicationautoscaling-controller.watch-namespace" -}}
3535
{{- if eq .Values.installScope "namespace" -}}
3636
{{ .Values.watchNamespace | default .Release.Namespace }}
3737
{{- end -}}
3838
{{- end -}}
3939

4040
{{/* The mount path for the shared credentials file */}}
41-
{{- define "aws.credentials.secret_mount_path" -}}
41+
{{- define "ack-applicationautoscaling-controller.aws.credentials.secret_mount_path" -}}
4242
{{- "/var/run/secrets/aws" -}}
4343
{{- end -}}
4444

4545
{{/* The path the shared credentials file is mounted */}}
46-
{{- define "aws.credentials.path" -}}
47-
{{- printf "%s/%s" (include "aws.credentials.secret_mount_path" .) .Values.aws.credentials.secretKey -}}
46+
{{- define "ack-applicationautoscaling-controller.aws.credentials.path" -}}
47+
{{ $secret_mount_path := include "ack-applicationautoscaling-controller.aws.credentials.secret_mount_path" . }}
48+
{{- printf "%s/%s" $secret_mount_path .Values.aws.credentials.secretKey -}}
49+
{{- end -}}
50+
51+
{{/* The rules a of ClusterRole or Role */}}
52+
{{- define "ack-applicationautoscaling-controller.rbac-rules" -}}
53+
rules:
54+
- apiGroups:
55+
- ""
56+
resources:
57+
- configmaps
58+
- secrets
59+
verbs:
60+
- get
61+
- list
62+
- patch
63+
- watch
64+
- apiGroups:
65+
- ""
66+
resources:
67+
- namespaces
68+
verbs:
69+
- get
70+
- list
71+
- watch
72+
- apiGroups:
73+
- applicationautoscaling.services.k8s.aws
74+
resources:
75+
- scalabletargets
76+
- scalingpolicies
77+
verbs:
78+
- create
79+
- delete
80+
- get
81+
- list
82+
- patch
83+
- update
84+
- watch
85+
- apiGroups:
86+
- applicationautoscaling.services.k8s.aws
87+
resources:
88+
- scalabletargets/status
89+
- scalingpolicies/status
90+
verbs:
91+
- get
92+
- patch
93+
- update
94+
- apiGroups:
95+
- services.k8s.aws
96+
resources:
97+
- adoptedresources
98+
- fieldexports
99+
verbs:
100+
- create
101+
- delete
102+
- get
103+
- list
104+
- patch
105+
- update
106+
- watch
107+
- apiGroups:
108+
- services.k8s.aws
109+
resources:
110+
- adoptedresources/status
111+
- fieldexports/status
112+
verbs:
113+
- get
114+
- patch
115+
- update
116+
{{- end }}
117+
118+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
119+
{{- define "ack-applicationautoscaling-controller.feature-gates" -}}
120+
{{- $list := list -}}
121+
{{- range $k, $v := .Values.featureGates -}}
122+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
123+
{{- end -}}
124+
{{ join "," $list }}
48125
{{- end -}}

‎addons/applicationautoscaling-chart/templates/caches-role-binding.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-namespaces-cache
5+
labels:
6+
app.kubernetes.io/name: {{ include "ack-applicationautoscaling-controller.app.name" . }}
7+
app.kubernetes.io/instance: {{ .Release.Name }}
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
10+
k8s-app: {{ include "ack-applicationautoscaling-controller.app.name" . }}
11+
helm.sh/chart: {{ include "ack-applicationautoscaling-controller.chart.name-version" . }}
12+
roleRef:
13+
kind: ClusterRole
14+
apiGroup: rbac.authorization.k8s.io
15+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-namespaces-cache
16+
subjects:
17+
- kind: ServiceAccount
18+
name: {{ include "ack-applicationautoscaling-controller.service-account.name" . }}
19+
namespace: {{ .Release.Namespace }}
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
22+
kind: RoleBinding
23+
metadata:
24+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-configmaps-cache
25+
namespace: {{ .Release.Namespace }}
26+
labels:
27+
app.kubernetes.io/name: {{ include "ack-applicationautoscaling-controller.app.name" . }}
28+
app.kubernetes.io/instance: {{ .Release.Name }}
29+
app.kubernetes.io/managed-by: Helm
30+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
31+
k8s-app: {{ include "ack-applicationautoscaling-controller.app.name" . }}
32+
helm.sh/chart: {{ include "ack-applicationautoscaling-controller.chart.name-version" . }}
33+
roleRef:
34+
kind: Role
35+
apiGroup: rbac.authorization.k8s.io
36+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-configmaps-cache
37+
subjects:
38+
- kind: ServiceAccount
39+
name: {{ include "ack-applicationautoscaling-controller.service-account.name" . }}
40+
namespace: {{ .Release.Namespace }}

‎addons/applicationautoscaling-chart/templates/caches-role.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-namespaces-cache
5+
labels:
6+
app.kubernetes.io/name: {{ include "ack-applicationautoscaling-controller.app.name" . }}
7+
app.kubernetes.io/instance: {{ .Release.Name }}
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
10+
k8s-app: {{ include "ack-applicationautoscaling-controller.app.name" . }}
11+
helm.sh/chart: {{ include "ack-applicationautoscaling-controller.chart.name-version" . }}
12+
rules:
13+
- apiGroups:
14+
- ""
15+
resources:
16+
- namespaces
17+
verbs:
18+
- get
19+
- list
20+
- watch
21+
---
22+
apiVersion: rbac.authorization.k8s.io/v1
23+
kind: Role
24+
metadata:
25+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-configmaps-cache
26+
namespace: {{ .Release.Namespace }}
27+
labels:
28+
app.kubernetes.io/name: {{ include "ack-applicationautoscaling-controller.app.name" . }}
29+
app.kubernetes.io/instance: {{ .Release.Name }}
30+
app.kubernetes.io/managed-by: Helm
31+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
32+
k8s-app: {{ include "ack-applicationautoscaling-controller.app.name" . }}
33+
helm.sh/chart: {{ include "ack-applicationautoscaling-controller.chart.name-version" . }}
34+
rules:
35+
- apiGroups:
36+
- ""
37+
resources:
38+
- configmaps
39+
verbs:
40+
- get
41+
- list
42+
- watch

‎addons/applicationautoscaling-chart/templates/cluster-role-binding.yaml‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,52 @@
1-
apiVersion: rbac.authorization.k8s.io/v1
21
{{ if eq .Values.installScope "cluster" }}
2+
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
5-
name: {{ include "app.fullname" . }}
5+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}-rolebinding
6+
labels:
7+
app.kubernetes.io/name: {{ include "ack-applicationautoscaling-controller.app.name" . }}
8+
app.kubernetes.io/instance: {{ .Release.Name }}
9+
app.kubernetes.io/managed-by: Helm
10+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
11+
k8s-app: {{ include "ack-applicationautoscaling-controller.app.name" . }}
12+
helm.sh/chart: {{ include "ack-applicationautoscaling-controller.chart.name-version" . }}
613
roleRef:
714
kind: ClusterRole
8-
{{ else }}
15+
apiGroup: rbac.authorization.k8s.io
16+
name: {{ include "ack-applicationautoscaling-controller.app.fullname" . }}
17+
subjects:
18+
- kind: ServiceAccount
19+
name: {{ include "ack-applicationautoscaling-controller.service-account.name" . }}
20+
namespace: {{ .Release.Namespace }}
21+
{{ else if eq .Values.installScope "namespace" }}
22+
{{ $wn := include "ack-applicationautoscaling-controller.watch-namespace" . }}
23+
{{ $namespaces := split "," $wn }}
24+
{{ $fullname := include "ack-applicationautoscaling-controller.app.fullname" . }}
25+
{{ $releaseNamespace := .Release.Namespace }}
26+
{{ $serviceAccountName := include "ack-applicationautoscaling-controller.service-account.name" . }}
27+
{{ $chartVersion := include "ack-applicationautoscaling-controller.chart.name-version" . }}
28+
{{ $appVersion := .Chart.AppVersion | quote }}
29+
{{ range $namespaces }}
30+
---
31+
apiVersion: rbac.authorization.k8s.io/v1
932
kind: RoleBinding
1033
metadata:
11-
name: {{ include "app.fullname" . }}
12-
namespace: {{ .Release.Namespace }}
34+
name: {{ $fullname }}-{{ . }}
35+
namespace: {{ . }}
36+
labels:
37+
app.kubernetes.io/name: {{ $fullname }}
38+
app.kubernetes.io/instance: {{ $.Release.Name }}
39+
app.kubernetes.io/managed-by: Helm
40+
app.kubernetes.io/version: {{ $appVersion }}
41+
k8s-app: {{ $fullname }}
42+
helm.sh/chart: {{ $chartVersion }}
1343
roleRef:
1444
kind: Role
15-
{{ end }}
1645
apiGroup: rbac.authorization.k8s.io
17-
name: ack-applicationautoscaling-controller
46+
name: {{ $fullname }}-{{ . }}
1847
subjects:
1948
- kind: ServiceAccount
20-
name: {{ include "service-account.name" . }}
21-
namespace: {{ .Release.Namespace }}
49+
name: {{ $serviceAccountName }}
50+
namespace: {{ $releaseNamespace }}
51+
{{ end }}
52+
{{ end }}

0 commit comments

Comments
 (0)