Update to ACK runtime v0.26.0, code-generator v0.26.1 (#69)

### Update to ACK runtime `v0.26.0`, code-generator `v0.26.1` ---------- * ACK code-generator `v0.26.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.26.1) * ACK runtime `v0.26.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.26.0) ---------- NOTE: This PR increments the release version of service controller from `v1.0.2` to `v1.0.3` Once this PR is merged, release `v1.0.3` will be automatically created for `eks-controller` **Please close this PR, if you do not want the new patch release for `eks-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building eks-controller ==== Copying common custom resource definitions into eks Building Kubernetes API objects for eks Generating deepcopy code for eks Generating custom resource definitions for eks Building service controller for eks Generating RBAC manifests for eks Running gofmt against generated code for eks Updating additional GitHub repository maintenance files ==== building eks-controller release artifacts ==== Building release artifacts for eks-v1.0.3 Generating common custom resource definitions Generating custom resource definitions for eks Generating RBAC manifests for eks ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Jun 12, 2023 · 78e11b7 · 78e11b7
1 parent 32cca06
commit 78e11b7
Show file tree

Hide file tree

Showing 20 changed files with 393 additions and 267 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2023-03-22T21:55:10Z"
-  build_hash: fa24753ea8b657d8815ae3eac7accd0958f5f9fb
+  build_date: "2023-05-15T23:25:22Z"
+  build_hash: 8f3ba427974fd6e769926778d54834eaee3b81a3
   go_version: go1.19
-  version: v0.25.0
+  version: v0.26.1
 api_directory_checksum: 1f80f5565b681614b1bef5950ba11a1df0b8b486
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.195

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -73,6 +73,9 @@ spec:
           capabilities:
             drop:
               - ALL
+      securityContext:
+        seccompProfile:
+          type: RuntimeDefault
       terminationGracePeriodSeconds: 10
       serviceAccountName: ack-eks-controller
       hostIPC: false

diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/eks-controller
-  newTag: v1.0.2
+  newTag: 1.0.3
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/aws-controllers-k8s/ec2-controller v0.0.10
 	github.com/aws-controllers-k8s/iam-controller v0.0.8
-	github.com/aws-controllers-k8s/runtime v0.25.0
+	github.com/aws-controllers-k8s/runtime v0.26.0
 	github.com/aws/aws-sdk-go v1.44.195
 	github.com/go-logr/logr v1.2.3
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -42,8 +42,8 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.10 h1:RVGezMt5aySJZSj+h77SrHZ
 github.com/aws-controllers-k8s/ec2-controller v0.0.10/go.mod h1:N8vii7yTsYHmMjOhs4kl8MpJlBWIEHQFm11HO16J9C4=
 github.com/aws-controllers-k8s/iam-controller v0.0.8 h1:7F4W45I7l30jZZGS8FEesScJmOcnPASCoa1sHBcTLNI=
 github.com/aws-controllers-k8s/iam-controller v0.0.8/go.mod h1:IibRVHZc+MEISws4FXQVC0rGwTeePm/O1Pk4kpXq5x0=
-github.com/aws-controllers-k8s/runtime v0.25.0 h1:6SYa8qmbw+Yil5/LodF7LmIGxBhpjz4QEIvNjpeRuoc=
-github.com/aws-controllers-k8s/runtime v0.25.0/go.mod h1:jizDzKikL09cueIuA9ZxoZ+4pfn5U7oKW5s/ZAqOA6E=
+github.com/aws-controllers-k8s/runtime v0.26.0 h1:XKqygFzHSBtM74Ov9IroZbyCVeYei9Eskp4aKbJ2SFw=
+github.com/aws-controllers-k8s/runtime v0.26.0/go.mod h1:jizDzKikL09cueIuA9ZxoZ+4pfn5U7oKW5s/ZAqOA6E=
 github.com/aws/aws-sdk-go v1.44.195 h1:d5xFL0N83Fpsq2LFiHgtBUHknCRUPGHdOlCWt/jtOJs=
 github.com/aws/aws-sdk-go v1.44.195/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: eks-chart
 description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
-version: v1.0.2
-appVersion: v1.0.2
+version: 1.0.3
+appVersion: 1.0.3
 home: https://github.com/aws-controllers-k8s/eks-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-controller:v1.0.2".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/eks-controller:1.0.3".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -33,7 +33,7 @@ If release name contains chart name it will be used as a full name.
 
 {{- define "watch-namespace" -}}
 {{- if eq .Values.installScope "namespace" -}}
-{{- .Release.Namespace -}}
+{{ .Values.watchNamespace | default .Release.Namespace }}
 {{- end -}}
 {{- end -}}
 

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -116,6 +116,9 @@ spec:
           capabilities:
             drop:
               - ALL
+      securityContext:
+        seccompProfile:
+          type: RuntimeDefault
       terminationGracePeriodSeconds: 10
       nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
       {{ if .Values.deployment.tolerations -}}

diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -196,6 +196,9 @@
       "type": "string",
       "enum": ["cluster", "namespace"]
     },
+    "watchNamespace": {
+      "type": "string"
+    },    
     "resourceTags": {
       "type": "array",
       "items": {

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/eks-controller
-  tag: v1.0.2
+  tag: 1.0.3
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -31,7 +31,7 @@ deployment:
 
 # If "installScope: cluster" then these labels will be applied to ClusterRole
 role:
- labels: {}
+  labels: {}
 
 metrics:
   service:
@@ -72,6 +72,10 @@ log:
 # cluster wide.
 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.
+watchNamespace: ""
+
 resourceTags:
   # Configures the ACK service controller to always set key/value pairs tags on
   # resources that it manages.

diff --git a/pkg/resource/addon/references.go b/pkg/resource/addon/references.go
diff --git a/pkg/resource/addon/resource.go b/pkg/resource/addon/resource.go