DEVOPS-2689-extend-k-8-s-operator-support-to-include-stateful-sets

.gitignore

@@ -25,3 +25,5 @@ coverage-report.html
 *.swo
 *~
 .vscode
+# macOS
+.DS_Store

api/v1beta/lightrunjavaagent_types.go

@@ -23,6 +23,17 @@ import (
 // Important: Run "make" to regenerate code after modifying this file
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
+// WorkloadType defines the type of workload that can be patched
+// +kubebuilder:validation:Enum=Deployment;StatefulSet
+type WorkloadType string
+
+const (
+	// WorkloadTypeDeployment represents a Kubernetes Deployment
+	WorkloadTypeDeployment WorkloadType = "Deployment"
+	// WorkloadTypeStatefulSet represents a Kubernetes StatefulSet
+	WorkloadTypeStatefulSet WorkloadType = "StatefulSet"
+)
+
 type InitContainer struct {
 	// Name of the volume that will be added to pod
 	SharedVolumeName string `json:"sharedVolumeName"`
@@ -38,8 +49,17 @@ type LightrunJavaAgentSpec struct {
 	ContainerSelector []string      `json:"containerSelector"`
 	InitContainer     InitContainer `json:"initContainer"`
 
-	//Name of the Deployment that will be patched
-	DeploymentName string `json:"deploymentName"`
+	// Name of the Deployment that will be patched. Deprecated, use WorkloadName and WorkloadType instead
+	// +optional
+	DeploymentName string `json:"deploymentName,omitempty"`
+
+	// Name of the Workload that will be patched. workload can be either Deployment or StatefulSet e.g. my-deployment, my-statefulset
+	// +optional
+	WorkloadName string `json:"workloadName,omitempty"`
+
+	// Type of the workload that will be patched supported values are Deployment, StatefulSet
+	// +optional
+	WorkloadType WorkloadType `json:"workloadType,omitempty"`
 
 	//Name of the Secret in the same namespace contains lightrun key and conmpany id
 	SecretName string `json:"secretName"`
@@ -76,14 +96,16 @@ type LightrunJavaAgentSpec struct {
 type LightrunJavaAgentStatus struct {
 	LastScheduleTime *metav1.Time       `json:"lastScheduleTime,omitempty"`
 	Conditions       []metav1.Condition `json:"conditions,omitempty"`
+	WorkloadStatus   string             `json:"workloadStatus,omitempty"`
 	DeploymentStatus string             `json:"deploymentStatus,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName=lrja
-//+kubebuilder:printcolumn:priority=0,name=Deployment,type=string,JSONPath=".spec.deploymentName",description="Deployment name",format=""
-//+kubebuilder:printcolumn:priority=0,name="Status",type=string,JSONPath=".status.deploymentStatus",description="Status of Deployment Reconciliation",format=""
+//+kubebuilder:printcolumn:priority=0,name=Workload,type=string,JSONPath=".spec.workloadName",description="Workload name",format=""
+//+kubebuilder:printcolumn:priority=0,name=Type,type=string,JSONPath=".spec.workloadType",description="Workload type",format=""
+//+kubebuilder:printcolumn:priority=0,name="Status",type=string,JSONPath=".status.workloadStatus",description="Status of Workload Reconciliation",format=""
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // LightrunJavaAgent is the Schema for the lightrunjavaagents API

charts/lightrun-operator/crds/lightrunjavaagent_crd.yaml

@@ -16,12 +16,16 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - description: Deployment name
-      jsonPath: .spec.deploymentName
-      name: Deployment
+    - description: Workload name
+      jsonPath: .spec.workloadName
+      name: Workload
       type: string
-    - description: Status of Deployment Reconciliation
-      jsonPath: .status.deploymentStatus
+    - description: Workload type
+      jsonPath: .spec.workloadType
+      name: Type
+      type: string
+    - description: Status of Workload Reconciliation
+      jsonPath: .status.workloadStatus
       name: Status
       type: string
     - jsonPath: .metadata.creationTimestamp
@@ -85,7 +89,8 @@ spec:
                   type: string
                 type: array
               deploymentName:
-                description: Name of the Deployment that will be patched
+                description: Name of the Deployment that will be patched. Deprecated,
+                  use WorkloadName and WorkloadType instead
                 type: string
               initContainer:
                 properties:
@@ -114,11 +119,21 @@ spec:
                   Lightrun server hostname that will be used for downloading an agent
                   Key and company id in the secret has to be taken from this server as well
                 type: string
+              workloadName:
+                description: Name of the Workload that will be patched. workload can
+                  be either Deployment or StatefulSet e.g. my-deployment, my-statefulset
+                type: string
+              workloadType:
+                description: Type of the workload that will be patched supported values
+                  are Deployment, StatefulSet
+                enum:
+                - Deployment
+                - StatefulSet
+                type: string
             required:
             - agentEnvVarName
             - agentTags
             - containerSelector
-            - deploymentName
             - initContainer
             - secretName
             - serverHostname
@@ -200,6 +215,8 @@ spec:
               lastScheduleTime:
                 format: date-time
                 type: string
+              workloadStatus:
+                type: string
             type: object
         type: object
     served: true

charts/lightrun-operator/generated/rbac_manager_rules.yaml

@@ -33,6 +33,15 @@
     - list
     - patch
     - watch
+- apiGroups:
+    - apps
+  resources:
+    - statefulsets
+  verbs:
+    - get
+    - list
+    - patch
+    - watch
 - apiGroups:
     - ""
   resources:

config/crd/bases/agents.lightrun.com_lightrunjavaagents.yaml

@@ -17,12 +17,16 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - description: Deployment name
-      jsonPath: .spec.deploymentName
-      name: Deployment
+    - description: Workload name
+      jsonPath: .spec.workloadName
+      name: Workload
       type: string
-    - description: Status of Deployment Reconciliation
-      jsonPath: .status.deploymentStatus
+    - description: Workload type
+      jsonPath: .spec.workloadType
+      name: Type
+      type: string
+    - description: Status of Workload Reconciliation
+      jsonPath: .status.workloadStatus
       name: Status
       type: string
     - jsonPath: .metadata.creationTimestamp
@@ -86,7 +90,8 @@ spec:
                   type: string
                 type: array
               deploymentName:
-                description: Name of the Deployment that will be patched
+                description: Name of the Deployment that will be patched. Deprecated,
+                  use WorkloadName and WorkloadType instead
                 type: string
               initContainer:
                 properties:
@@ -115,11 +120,21 @@ spec:
                   Lightrun server hostname that will be used for downloading an agent
                   Key and company id in the secret has to be taken from this server as well
                 type: string
+              workloadName:
+                description: Name of the Workload that will be patched. workload can
+                  be either Deployment or StatefulSet e.g. my-deployment, my-statefulset
+                type: string
+              workloadType:
+                description: Type of the workload that will be patched supported values
+                  are Deployment, StatefulSet
+                enum:
+                - Deployment
+                - StatefulSet
+                type: string
             required:
             - agentEnvVarName
             - agentTags
             - containerSelector
-            - deploymentName
             - initContainer
             - secretName
             - serverHostname
@@ -201,6 +216,8 @@ spec:
               lastScheduleTime:
                 format: date-time
                 type: string
+              workloadStatus:
+                type: string
             type: object
         type: object
     served: true

config/rbac/role.yaml

@@ -39,6 +39,15 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - patch
+  - watch
 - apiGroups:
   - ""
   resources:

config/samples/agents_v1beta_lightrunjavaagent.yaml

@@ -7,7 +7,8 @@ spec:
     image: "lightruncom/k8s-operator-init-java-agent-linux:1.7.0-init.0"
     sharedVolumeName: lightrun-agent-init
     sharedVolumeMountPath: "/lightrun"
-  deploymentName: app  
+  workloadName: app
+  workloadType: Deployment
   secretName: lightrun-secrets 
   serverHostname: <lightrun_server>  #for saas it will be app.lightrun.com
   agentEnvVarName: JAVA_TOOL_OPTIONS

config/samples/operator.yaml

@@ -28,12 +28,16 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - description: Deployment name
-      jsonPath: .spec.deploymentName
-      name: Deployment
+    - description: Workload name
+      jsonPath: .spec.workloadName
+      name: Workload
       type: string
-    - description: Status of Deployment Reconciliation
-      jsonPath: .status.deploymentStatus
+    - description: Workload type
+      jsonPath: .spec.workloadType
+      name: Type
+      type: string
+    - description: Status of Workload Reconciliation
+      jsonPath: .status.workloadStatus
       name: Status
       type: string
     - jsonPath: .metadata.creationTimestamp
@@ -97,7 +101,8 @@ spec:
                   type: string
                 type: array
               deploymentName:
-                description: Name of the Deployment that will be patched
+                description: Name of the Deployment that will be patched. Deprecated,
+                  use WorkloadName and WorkloadType instead
                 type: string
               initContainer:
                 properties:
@@ -126,11 +131,21 @@ spec:
                   Lightrun server hostname that will be used for downloading an agent
                   Key and company id in the secret has to be taken from this server as well
                 type: string
+              workloadName:
+                description: Name of the Workload that will be patched. workload can
+                  be either Deployment or StatefulSet e.g. my-deployment, my-statefulset
+                type: string
+              workloadType:
+                description: Type of the workload that will be patched supported values
+                  are Deployment, StatefulSet
+                enum:
+                - Deployment
+                - StatefulSet
+                type: string
             required:
             - agentEnvVarName
             - agentTags
             - containerSelector
-            - deploymentName
             - initContainer
             - secretName
             - serverHostname
@@ -212,6 +227,8 @@ spec:
               lastScheduleTime:
                 format: date-time
                 type: string
+              workloadStatus:
+                type: string
             type: object
         type: object
     served: true
@@ -315,6 +332,15 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - patch
+  - watch
 - apiGroups:
   - ""
   resources: