Skip to content

Commit 80a25f0

Browse files
authored
release artifacts for release v0.0.5 (#19)
- Improved logging with runtime `v0.3.0` - Added Metrics service to helm charts - Fixed aws-controllers-k8s/community#831 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 1a501a8 commit 80a25f0

File tree

6 files changed

+57
-6
lines changed

6 files changed

+57
-6
lines changed

helm/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: ack-mq-controller
33
description: A Helm chart for the ACK service controller for mq
4-
version: v0.0.4
5-
appVersion: v0.0.4
4+
version: v0.0.5
5+
appVersion: v0.0.5
66
home: https://github.com/aws-controllers-k8s/mq-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/crds/mq.services.k8s.aws_brokers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
metadata:
3535
type: object
3636
spec:
37-
description: BrokerSpec defines the desired state of Broker
37+
description: BrokerSpec defines the desired state of Broker.
3838
properties:
3939
authenticationStrategy:
4040
type: string

helm/templates/cluster-role-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ rules:
1717
- apiGroups:
1818
- ""
1919
resources:
20-
- secrets
20+
- namespaces
2121
verbs:
2222
- get
2323
- list
2424
- watch
2525
- apiGroups:
2626
- ""
2727
resources:
28-
- namespaces
28+
- secrets
2929
verbs:
3030
- get
3131
- list

helm/templates/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,16 @@ spec:
6060
valueFrom:
6161
fieldRef:
6262
fieldPath: metadata.namespace
63+
- name: AWS_ACCOUNT_ID
64+
value: {{ .Values.aws.account_id | quote }}
6365
- name: AWS_REGION
6466
value: {{ .Values.aws.region }}
6567
- name: ACK_WATCH_NAMESPACE
6668
value: {{ .Values.watchNamespace }}
69+
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
70+
value: {{ .Values.log.enable_development_logging | quote }}
71+
- name: ACK_LOG_LEVEL
72+
value: {{ .Values.log.level | quote }}
6773
- name: ACK_RESOURCE_TAGS
6874
value: {{ join "," .Values.resourceTags | quote }}
6975
terminationGracePeriodSeconds: 10
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{{- if .Values.metrics.service.create }}
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: {{ include "app.fullname" . }}-metrics
6+
namespace: {{ .Release.Namespace }}
7+
labels:
8+
app.kubernetes.io/name: {{ include "app.name" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: Helm
11+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
12+
k8s-app: {{ include "app.name" . }}
13+
helm.sh/chart: {{ include "chart.name-version" . }}
14+
control-plane: controller
15+
spec:
16+
selector:
17+
app.kubernetes.io/name: {{ include "app.name" . }}
18+
app.kubernetes.io/instance: {{ .Release.Name }}
19+
app.kubernetes.io/managed-by: Helm
20+
k8s-app: {{ include "app.name" . }}
21+
{{- range $key, $value := .Values.deployment.labels }}
22+
{{ $key }}: {{ $value | quote }}
23+
{{- end }}
24+
type: {{ .Values.metrics.service.type }}
25+
ports:
26+
- name: metricsport
27+
port: 8080
28+
targetPort: 8080
29+
protocol: TCP
30+
{{- end }}

helm/values.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/controller
7-
tag: mq-v0.0.4
7+
tag: mq-v0.0.5
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -16,6 +16,15 @@ deployment:
1616
labels: {}
1717
containerPort: 8080
1818

19+
metrics:
20+
service:
21+
# Set to true to automatically create a Kubernetes Service resource for the
22+
# Prometheus metrics server endpoint in controller
23+
create: false
24+
# Which Type to use for the Kubernetes Service?
25+
# See: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
26+
type: "ClusterIP"
27+
1928
resources:
2029
requests:
2130
memory: "64Mi"
@@ -27,6 +36,12 @@ resources:
2736
aws:
2837
# If specified, use the AWS region for AWS API calls
2938
region: ""
39+
account_id: ""
40+
41+
# log level for the controller
42+
log:
43+
enable_development_logging: false
44+
level: info
3045

3146
# If specified, the service controller will watch for object creation only in the provided namespace
3247
watchNamespace: ""

0 commit comments

Comments
 (0)