Merge pull request #123 from cdapio/feature/CDAP-21096_split_appfabri…

…c_service_processor [CDAP-21096] Split Appfabric into stateless service and stateful processor
cdapio · Jan 10, 2025 · 5ed7d5c · 5ed7d5c
2 parents 5a1bcbe + c877f2d
commit 5ed7d5c
Show file tree

Hide file tree

Showing 16 changed files with 3,389 additions and 54 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.21
+        go-version: 1.23
 
     - name: Install Kubebuilder
       run: |

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.23 as builder
 
 # Copy everything in the go src
 WORKDIR /go/src/cdap.io/cdap-operator

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.22
+ENVTEST_K8S_VERSION = 1.30
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -113,7 +113,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.7.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.5
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 
 .PHONY: kustomize

diff --git a/api/v1alpha1/cdapmaster_types.go b/api/v1alpha1/cdapmaster_types.go
@@ -65,6 +65,8 @@ type CDAPMasterSpec struct {
 	LogLevels map[string]string `json:"logLevels,omitempty"`
 	// AppFabric is specification for the CDAP app-fabric service.
 	AppFabric AppFabricSpec `json:"appFabric,omitempty"`
+	// AppFabricProcessor is specification for the CDAP app-fabric processor service.
+	AppFabricProcessor AppFabricProcessorSpec `json:"appFabricProcessor,omitempty"`
 	// Logs is specification for the CDAP logging service.
 	Logs LogsSpec `json:"logs,omitempty"`
 	// Messaging is specification for the CDAP messaging service.
@@ -218,6 +220,11 @@ type CDAPScalableStatefulServiceSpec struct {
 
 // AppFabricSpec defines the specification for the AppFabric service.
 type AppFabricSpec struct {
+	CDAPScalableServiceSpec `json:",inline"`
+}
+
+// AppFabricProcessorSpec defines the specification for the AppFabric Processor service.
+type AppFabricProcessorSpec struct {
 	CDAPStatefulServiceSpec `json:",inline"`
 }
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cdap.cdap.io_cdapmasters.yaml b/config/crd/bases/cdap.cdap.io_cdapmasters.yaml
diff --git a/controllers/constants.go b/controllers/constants.go
@@ -9,6 +9,9 @@ const (
 	// serviceAppFabric defines the service type for app-fabric
 	serviceAppFabric ServiceName = "AppFabric"
 
+	// serviceAppFabricProcessor defines the service type for app-fabric processor
+	serviceAppFabricProcessor ServiceName = "AppFabricProcessor"
+
 	// serviceLogs defines the service type for log processing and serving service
 	serviceLogs ServiceName = "Logs"
 

diff --git a/controllers/deployment.go b/controllers/deployment.go
@@ -45,17 +45,18 @@ func (d *DeploymentPlan) Init() {
 	// Default: each service runs in its own Pod
 	d.planMap[0] = ServiceGroups{
 		stateful: map[ServiceGroupName]ServiceGroup{
-			"logs":           {serviceLogs},
-			"messaging":      {serviceMessaging},
-			"metrics":        {serviceMetrics},
-			"preview":        {servicePreview},
-			"appfabric":      {serviceAppFabric},
-			"runtime":        {serviceRuntime},
-			"supportbundle":  {serviceSupportBundle},
-			"tetheringagent": {serviceTetheringAgent},
-			"artifactcache":  {serviceArtifactCache},
+			"appfabricprocessor": {serviceAppFabricProcessor},
+			"logs":               {serviceLogs},
+			"messaging":          {serviceMessaging},
+			"metrics":            {serviceMetrics},
+			"preview":            {servicePreview},
+			"runtime":            {serviceRuntime},
+			"supportbundle":      {serviceSupportBundle},
+			"tetheringagent":     {serviceTetheringAgent},
+			"artifactcache":      {serviceArtifactCache},
 		},
 		deployment: map[ServiceGroupName]ServiceGroup{
+			"appfabric":      {serviceAppFabric},
 			"authentication": {serviceAuthentication},
 			"metadata":       {serviceMetadata},
 			"router":         {serviceRouter},

diff --git a/controllers/testdata/appfabric.json b/controllers/testdata/appfabric.json
@@ -1,6 +1,6 @@
 {
   "apiVersion": "apps/v1",
-  "kind": "StatefulSet",
+  "kind": "Deployment",
   "metadata": {
     "annotations": {
       "deployment.kubernetes.io/revision": "8"
@@ -151,11 +151,6 @@
                 "name": "cdap-sysappconf",
                 "readOnly": true
               },
-              {
-                "mountPath": "/data",
-                "name": "cdap-test-appfabric-data",
-                "readOnly": true
-              },
               {
                 "mountPath": "/etc/cdap/security",
                 "name": "cdap-security",