Skip to content

Update to ACK runtime v0.27.1, code-generator v0.27.1 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2023-09-07T01:58:04Z"
build_hash: 2f2b5e916c59ae2a793a1cc9f9d7333b197c9549
build_date: "2023-09-14T23:50:27Z"
build_hash: 892f29d00a4c4ad21a2fa32919921de18190979d
go_version: go1.21.0
version: v0.27.0
version: v0.27.1
api_directory_checksum: f50cdf03c85532166479736d285eaf6330f91d2b
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
3 changes: 2 additions & 1 deletion config/controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,6 @@ spec:
terminationGracePeriodSeconds: 10
serviceAccountName: ack-s3-controller
hostIPC: false
hostNetwork: false
hostPID: false
hostNetwork: false
dnsPolicy: ClusterFirst
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
newTag: 1.0.5
newTag: 1.0.6
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: s3-chart
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
version: 1.0.5
appVersion: 1.0.5
version: 1.0.6
appVersion: 1.0.6
home: https://github.com/aws-controllers-k8s/s3-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:1.0.5".
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:1.0.6".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
15 changes: 7 additions & 8 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
k8s-app: {{ include "app.name" . }}
helm.sh/chart: {{ include "chart.name-version" . }}
spec:
replicas: 1
replicas: {{ .Values.deployment.replicas }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "app.name" . }}
Expand Down Expand Up @@ -48,8 +48,9 @@ spec:
- "$(AWS_REGION)"
- --aws-endpoint-url
- "$(AWS_ENDPOINT_URL)"
{{- if .Values.log.enable_development_logging }}
- --enable-development-logging
- "$(ENABLE_DEVELOPMENT_LOGGING)"
{{- end }}
- --log-level
- "$(ACK_LOG_LEVEL)"
- --resource-tags
Expand All @@ -58,10 +59,11 @@ spec:
- "$(ACK_WATCH_NAMESPACE)"
- --deletion-policy
- "$(DELETION_POLICY)"
{{- if .Values.leaderElection.enabled }}
- --enable-leader-election
- "$(ENABLE_LEADER_ELECTION)"
- --leader-election-namespace
- "$(LEADER_ELECTION_NAMESPACE)"
{{- end }}
{{- if gt .Values.reconcile.defaultResyncPeriod 0.0 }}
- --reconcile-default-resync-seconds
- "$(RECONCILE_DEFAULT_RESYNC_SECONDS)"
Expand Down Expand Up @@ -91,12 +93,8 @@ spec:
value: {{ include "watch-namespace" . }}
- name: DELETION_POLICY
value: {{ .Values.deletionPolicy }}
- name: ENABLED_LEADER_ELECTION
value: {{ .Values.leaderElection.enabled | quote }}
- name: LEADER_ELECTION_NAMESPACE
value: {{ .Values.leaderElection.namespace | quote }}
- name: ACK_ENABLE_DEVELOPMENT_LOGGING
value: {{ .Values.log.enable_development_logging | quote }}
- name: ACK_LOG_LEVEL
value: {{ .Values.log.level | quote }}
- name: ACK_RESOURCE_TAGS
Expand Down Expand Up @@ -149,8 +147,9 @@ spec:
priorityClassName: {{ .Values.deployment.priorityClassName }}
{{ end -}}
hostIPC: false
hostNetwork: false
hostPID: false
hostNetwork: {{ .Values.deployment.hostNetwork }}
dnsPolicy: {{ .Values.deployment.dnsPolicy }}
volumes:
{{- if .Values.aws.credentials.secretName -}}
- name: {{ .Values.aws.credentials.secretName }}
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/leader-election-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ roleRef:
name: s3-leader-election-role
subjects:
- kind: ServiceAccount
name: ack-s3-controller
name: {{ include "service-account.name" . }}
namespace: {{ .Release.Namespace }}{{- end }}
3 changes: 3 additions & 0 deletions helm/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
"minimum": 1,
"maximum": 65535
},
"replicas": {
"type": "integer"
},
"nodeSelector": {
"type": "object"
},
Expand Down
19 changes: 16 additions & 3 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/s3-controller
tag: 1.0.5
tag: 1.0.6
pullPolicy: IfNotPresent
pullSecrets: []

Expand All @@ -15,6 +15,10 @@ deployment:
annotations: {}
labels: {}
containerPort: 8080
# Number of Deployment replicas
# This determines how many instances of the controller will be running. It's recommended
# to enable leader election if you need to increase the number of replicas > 1
replicas: 1
# Which nodeSelector to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
nodeSelector:
Expand All @@ -28,6 +32,15 @@ deployment:
# Which priorityClassName to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
priorityClassName: ""
# Specifies the hostname of the Pod.
# If not specified, the pod's hostname will be set to a system-defined value.
hostNetwork: false
# Set DNS policy for the pod.
# Defaults to "ClusterFirst".
# Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'.
# To have DNS options set along with hostNetwork, you have to specify DNS policy
# explicitly to 'ClusterFirstWithHostNet'.
dnsPolicy: ClusterFirst
extraVolumes: []
extraVolumeMounts: []

Expand All @@ -52,7 +65,7 @@ deployment:
# If "installScope: cluster" then these labels will be applied to ClusterRole
role:
labels: {}

metrics:
service:
# Set to true to automatically create a Kubernetes Service resource for the
Expand Down Expand Up @@ -80,7 +93,7 @@ aws:
# Secret stringData key that contains the credentials
secretKey: "credentials"
# Profile used for AWS credentials
profile: "default"
profile: "default"

# log level for the controller
log:
Expand Down