Skip to content

Commit

Permalink
Update to ACK runtime v0.27.1, code-generator v0.27.1 (#42)
Browse files Browse the repository at this point in the history
### Update to ACK runtime `v0.27.1`, code-generator `v0.27.1`

----------

* ACK code-generator `v0.27.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.27.1)
* ACK runtime `v0.27.1` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.27.1)

----------

NOTE:
This PR increments the release version of service controller from `v1.0.3` to `v1.0.4`

Once this PR is merged, release `v1.0.4` will be automatically created for `emrcontainers-controller`

**Please close this PR, if you do not want the new patch release for `emrcontainers-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building emrcontainers-controller ====
Copying common custom resource definitions into emrcontainers
Building Kubernetes API objects for emrcontainers
Generating deepcopy code for emrcontainers
Generating custom resource definitions for emrcontainers
Building service controller for emrcontainers
Generating RBAC manifests for emrcontainers
Running gofmt against generated code for emrcontainers
Updating additional GitHub repository maintenance files
==== building emrcontainers-controller release artifacts ====
Building release artifacts for emrcontainers-v1.0.4
Generating common custom resource definitions
Generating custom resource definitions for emrcontainers
Generating RBAC manifests for emrcontainers
```

----------

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • Loading branch information
ack-bot authored Sep 15, 2023
1 parent 2593d78 commit b75141c
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 20 deletions.
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:28:31Z"
build_hash: 2f2b5e916c59ae2a793a1cc9f9d7333b197c9549
build_date: "2023-09-14T23:41:13Z"
build_hash: 892f29d00a4c4ad21a2fa32919921de18190979d
go_version: go1.21.0
version: v0.27.0
version: v0.27.1
api_directory_checksum: 1066e3b0ac63732903ec4155dba6b658fd83ef84
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-emrcontainers-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/emrcontainers-controller
newTag: 1.0.3
newTag: 1.0.4
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: emrcontainers-chart
description: A Helm chart for the ACK service controller for Amazon EMR on EKS (EMRContainers)
version: 1.0.3
appVersion: 1.0.3
version: 1.0.4
appVersion: 1.0.4
home: https://github.com/aws-controllers-k8s/emrcontainers-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/emrcontainers-controller:1.0.3".
This chart deploys "public.ecr.aws/aws-controllers-k8s/emrcontainers-controller:1.0.4".

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: emrcontainers-leader-election-role
subjects:
- kind: ServiceAccount
name: ack-emrcontainers-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/emrcontainers-controller
tag: 1.0.3
tag: 1.0.4
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

0 comments on commit b75141c

Please sign in to comment.