rbac-proxy

Makefile

@@ -41,7 +41,7 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

api/v1alpha1/cdapmaster_types.go

@@ -116,6 +116,11 @@ type CDAPMasterSpec struct {
 	// collection of system metrics. Services which have CDAPServiceSpec.EnableSystemMetrics as nil, missing or set to false,
 	// will have metrics sidecar container disabled.
 	SystemMetricsExporter *SystemMetricExporterSpec `json:"systemMetricsExporter,omitempty"`
+	// TaskManager is specification for the CDAP Task Manager / Netty Proxy service.
+	// This is an optional service and may not be required for CDAP to be operational.
+	// To disable this service: either omit or set the field to nil
+	// To enable this service: set it to a pointer to a TaskManagerSpec struct (can be an empty struct).
+	TaskManager *TaskManagerSpec `json:"taskManager,omitempty"`
 	// SecurityContext defines the security context for all pods for all services.
 	SecurityContext *SecurityContext `json:"securityContext,omitempty"`
 	// AdditionalVolumes defines a list of additional volumes for all services.
@@ -307,6 +312,11 @@ type SystemMetricExporterSpec struct {
 	CDAPServiceSpec `json:",inline"`
 }
 
+// TaskManagerSpec defines the specification for the Task Manager / Netty Proxy service.
+type TaskManagerSpec struct {
+	CDAPServiceSpec `json:",inline"`
+}
+
 // StartupProbe defines the fields for setting corev1.Probe for the main containers in the service pods.
 // For Probe config see:
 // https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes.

controllers/cdapmaster_controller.go

@@ -166,9 +166,9 @@ func ApplyDefaults(resource interface{}) {
 	finalizer.EnsureStandard(r)
 }
 
-/////////////////////////////////////////////////////////
-///// Handling reconciling ConfigMapHandler objects /////
-/////////////////////////////////////////////////////////
+// ///////////////////////////////////////////////////////
+// /// Handling reconciling ConfigMapHandler objects /////
+// ///////////////////////////////////////////////////////
 type ConfigMapHandler struct{}
 
 func (h *ConfigMapHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {
@@ -257,9 +257,9 @@ func buildConfigMapObject(spec *ConfigMapSpec) reconciler.Object {
 	return obj
 }
 
-///////////////////////////////////////////////////////////
-///// Handling reconciling deployment of all services /////
-///////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////
+// /// Handling reconciling deployment of all services /////
+// /////////////////////////////////////////////////////////
 type ServiceHandler struct{}
 
 func (h *ServiceHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {
@@ -337,9 +337,9 @@ func CopyNodePortIfAny(expected, observed []reconciler.Object) {
 	}
 }
 
-///////////////////////////////////////////////////////
-///// Handler for image version upgrade/downgrade /////
-///////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////
+// /// Handler for image version upgrade/downgrade /////
+// /////////////////////////////////////////////////////
 type VersionUpdateHandler struct{}
 
 func (h *VersionUpdateHandler) Observables(rsrc interface{}, labels map[string]string, dependent []reconciler.Object) []reconciler.Observable {

controllers/constants.go

@@ -50,6 +50,9 @@ const (
 	// serviceUserInterface defines the service type for user interface
 	serviceUserInterface ServiceName = "UserInterface"
 
+	// serviceTaskManager defines the service type for task manager / netty proxy service
+	serviceTaskManager ServiceName = "TaskManager"
+
 	// serviceSystemMetricsExporter defines the service type for sidecar metrics collection service
 	serviceSystemMetricsExporter ServiceName = "SystemMetricsExporter"
 )

controllers/deployment.go

@@ -61,6 +61,7 @@ func (d *DeploymentPlan) Init() {
 			"metadata":       {serviceMetadata},
 			"router":         {serviceRouter},
 			"userinterface":  {serviceUserInterface},
+			"taskmanager":    {serviceTaskManager},
 		},
 		networkService: map[NetworkServiceName]ServiceName{
 			"router":        serviceRouter,
@@ -333,9 +334,9 @@ func startupProbeSpec(serviceSpec *v1alpha1.CDAPServiceSpec, service string) (*c
 	serviceName := strings.ToLower(service)
 	var endpoint string
 	if serviceName == "router" || serviceName == "userinterface" {
-	  endpoint = fmt.Sprintf("http://localhost:%d/status", port)
+		endpoint = fmt.Sprintf("http://localhost:%d/status", port)
 	} else {
-	  endpoint = fmt.Sprintf("https://localhost:%d/v3/system/services/%s/status", port, serviceName)
+		endpoint = fmt.Sprintf("https://localhost:%d/v3/system/services/%s/status", port, serviceName)
 	}
 
 	return &corev1.Probe{

controllers/deployment_test.go

@@ -100,7 +100,8 @@ var _ = Describe("Controller Suite", func() {
 		It("k8s objs for just essential services", func() {
 			master.Spec.Runtime = nil
 			master.Spec.Messaging = nil
-			numOptionalServices := 2
+			master.Spec.TaskManager = nil
+			numOptionalServices := 3
 
 			emptyLabels := make(map[string]string)
 			spec, err := buildDeploymentPlanSpec(master, emptyLabels)

controllers/testdata/cdap_master_cr.json

@@ -371,6 +371,17 @@
         }
       }
     },
+    "taskManager": {
+      "metadata": {
+        "creationTimestamp": null
+      },
+      "resources": {
+        "requests": {
+          "cpu": "100m",
+          "memory": "100Mi"
+        }
+      }
+    },
     "securitySecret": "cdap-secret",
     "serviceAccountName": "cdap",
     "userInterface": {