Merge pull request #60 from akartsky/namespace_scope

Namespace scope service controllers
aws-controllers-k8s · May 14, 2021 · cba1bea · cba1bea
2 parents d63e230 + 7e7aff2
commit cba1bea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/code-generator
 go 1.14
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.1.0
+	github.com/aws-controllers-k8s/runtime v0.2.0
 	github.com/aws/aws-sdk-go v1.37.4
 	github.com/dlclark/regexp2 v1.4.0
 	// pin to v0.1.1 due to release problem with v0.1.2

diff --git a/templates/cmd/controller/main.go.tpl b/templates/cmd/controller/main.go.tpl
@@ -54,6 +54,7 @@ func main() {
 		MetricsBindAddress: ackCfg.MetricsAddr,
 		LeaderElection:	 ackCfg.EnableLeaderElection,
 		LeaderElectionID:   awsServiceAPIGroup,
+		Namespace: ackCfg.WatchNamespace,
 	})
 	if err != nil {
 		setupLog.Error(

diff --git a/templates/config/controller/deployment.yaml.tpl b/templates/config/controller/deployment.yaml.tpl
@@ -36,6 +36,8 @@ spec:
         - "$(ACK_LOG_LEVEL)"
         - --resource-tags
         - "$(ACK_RESOURCE_TAGS)"
+        - --watch-namespace
+        - "$(ACK_WATCH_NAMESPACE)"
         image: controller:latest
         name: controller
         ports:

diff --git a/templates/helm/templates/deployment.yaml b/templates/helm/templates/deployment.yaml
@@ -47,6 +47,8 @@ spec:
         - "$(ACK_LOG_LEVEL)"
         - --resource-tags
         - "$(ACK_RESOURCE_TAGS)"
+        - --watch-namespace
+        - "$(ACK_WATCH_NAMESPACE)"
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         name: controller
         ports:
@@ -60,6 +62,8 @@ spec:
               fieldPath: metadata.namespace
         - name: AWS_REGION
           value: {{ .Values.aws.region }}
+        - name: ACK_WATCH_NAMESPACE
+          value: {{ .Values.watchNamespace }}
         - name: ACK_RESOURCE_TAGS
           value: {{ join "," .Values.resourceTags | quote }}
       terminationGracePeriodSeconds: 10
diff --git a/templates/helm/values.yaml.tpl b/templates/helm/values.yaml.tpl
@@ -28,6 +28,9 @@ aws:
   # If specified, use the AWS region for AWS API calls
   region: ""
 
+# If specified, the service controller will watch for object creation only in the provided namespace
+watchNamespace: ""
+
 resourceTags:
   # Configures the ACK service controller to always set key/value pairs tags on resources that it manages.
   - services.k8s.aws/managed=true