From 5d1a554d43f849701f0cab2391aa1a13f6a6d97c Mon Sep 17 00:00:00 2001
From: Jan Lauber <jan.lauber@protonmail.ch>
Date: Wed, 22 May 2024 21:28:30 +0200
Subject: [PATCH] feat: Add CronJobSpec to RolloutSpec

Signed-off-by: Jan Lauber <jan.lauber@protonmail.ch>
---
 .DS_Store                                    | Bin 6148 -> 8196 bytes
 .gitignore                                   |   3 +-
 README.md                                    |   1 +
 api/v1alpha1/rollout_types.go                |   7 +++
 config/.DS_Store                             | Bin 8196 -> 8196 bytes
 config/crd/bases/one-click.dev_rollouts.yaml |  20 ++++++++
 controllers/deployment.go                    |  46 +++++++++++++++++++
 7 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index 3d5e7c7ef5025396ac336b769ec719fb9ba13487..fb9667d4d5b8254f2276377245b674ba2656d5c5 100644
GIT binary patch
literal 8196
zcmeHM&ubGw6n>M$CLtDcXrbN~h2WuJBBfOH5Mx9{1TkU-l{A~A>C(+kNH)zO1as1Z
z^`sXs;vXR1Ja`bjc=Mow-UJaWB7)#q&^JGl%rxETO{Ft1^Ct7XdGDKVH#?aP0FYd}
zk^z_lfEZS0lL>5gC=6$Htc2u93N69;kSUaDy)ouz28;qm0i%FXz$jo8_;(b*J)4zS
zz`id~(;5Yg0=rTH_I$9gGMkmQFD!p_V8f39Xd^hx3-*(&gVvHZD{Ws`M6eJs6|I;`
z<Pn32={RmlzpS)<Va0SH^6)`qW+G20glEV27Iz1d71p#y0i(dU0_^M_h7vTuack=N
z{c>-F)M-9%yVS;!*ysDN4&8qE;)IG;CZLTqH7b8O5C$6@@YH;>sa2Op<cON@>zzgW
z?pv8pqN9A{sG4s!^#Fsy6y|G#2NiIks%8aPKEEATbKm<oT&otNPDc!ad{iC)l1CXR
z@>s>y*K{6V&T<|KuJV|E_IjZC6lgvp9zi}DkI-{W0|^<!hbHoInJU<8>5RTz5B5~K
zeXo9aochVHPe5E%t>1fVe8~#q8-X>vL(8zPGYlP2F_qJ!b8iNE4d<#XcEYv1ViVd6
zE$~sHCT6dpMn$X}*mvztt0BJ+Pwa;4wET4X9SMaad#0k%cr+2cR#>B*f?x96tz4;j
zg?+k6scR4VCHs<7?G%$UC#mO`9Ix8s6P!vFU9K)WUWImYwCz<|d~QJi@pvp=Oz!V?
zGfPXEd24YY)0?-tM~|fEt%b#fUN0V-J$U%oh2pwf_vkIA9PWd1zl3S=dDw1ZFK~gn
z&|7CF`KrSEn@?wsi<==Zwt6A{#9zBG;)V!}y-{d-F7;~2m#sU3m#@k$qQ0Je?^R6Y
zzh3_2yxih9^Kh=pcPCuq2U!e_51b9m%N{s*^QgH)KW;Dw4OjES>7jnxd`4gNARm=S
z_-2~%FvTb^L4mNq=GgiFRPg)%2@wor6fg?>?+TDezL3x1Dh9t5wl64z0~Xd5tgJA<
qzOZ}>Hq3>M^W!+$;U9+Bw<MO8wl6FqSpLF`0JHyd<xR7j75D|07_j*O

delta 486
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5sJ6q~50$SAWhU^g?P%w!$`2^$Y3pbRrZ
zB0~W~W^TTVOHxjL5=f7<rDgfm)}xNdvMFe?lM@7_!V-WgfCeNnWHRLCq#Fh&=jRrH
zghW0V&q2r_8(nlDJZQ^8sL^13x%mjAA+nP%2uLuCd?=XwTELd=+>dbe({m>43Ch8k
zL4pn{=cIwgvoRzy<TK<kqyeo@N4Dg116a>CpdKjmmY@RTg2}%HHJR?)O#UM%HQ7Ok
zhfQW-V|&-q$qhm>lk<?dT8s{pR|}b{UC3`e^|l%8Ru+Z~U@#>!WFxy4B0rf;SW%LN
zp@boop_rirITU~q(LR|`RD!MT12>OI>tuORDHzjUREAMtVq(r>b`B0fW>Am;qlp_x
gxPqc;W8!z_$^0^&pon8&f<z)HUKuvW^UPre0KdqA?*IS*

diff --git a/.gitignore b/.gitignore
index c545efd..7979895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ Dockerfile.cross
 *~
 vendor/
 
-test.yaml
\ No newline at end of file
+test.yaml
+.DS_Store
diff --git a/README.md b/README.md
index 1a8b6fb..fd80218 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ metadata:
 spec:
   args: ["nginx", "-g", "daemon off;"]
   command: ["nginx"]
+  rolloutStrategy: rollingUpdate # or "recreate"
   image:
     registry: "docker.io"
     repository: "nginx"
diff --git a/api/v1alpha1/rollout_types.go b/api/v1alpha1/rollout_types.go
index 7c8eec6..60cdf9c 100644
--- a/api/v1alpha1/rollout_types.go
+++ b/api/v1alpha1/rollout_types.go
@@ -116,6 +116,7 @@ type CronJobSpec struct {
 type RolloutSpec struct {
 	Args               []string             `json:"args,omitempty"`
 	Command            []string             `json:"command,omitempty"`
+	RolloutStrategy    string               `json:"rolloutStrategy,omitempty"`
 	Image              ImageSpec            `json:"image"`
 	SecurityContext    SecurityContextSpec  `json:"securityContext,omitempty"`
 	HorizontalScale    HorizontalScaleSpec  `json:"horizontalScale"`
@@ -174,6 +175,12 @@ type RolloutStatus struct {
 //+kubebuilder:printcolumn:name="ImageTag",type="string",JSONPath=".spec.image.tag"
 //+kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.horizontalScale.minReplicas"
 //+kubebuilder:printcolumn:name="Deployment Status",type="string",JSONPath=".status.deployment.status"
+//+kubebuilder:printcolumn:name="Service Status",type="string",JSONPath=".status.services[*].status"
+//+kubebuilder:printcolumn:name="Ingress Status",type="string",JSONPath=".status.ingresses[*].status"
+//+kubebuilder:printcolumn:name="Volume Status",type="string",JSONPath=".status.volumes[*].status"
+//+kubebuilder:printcolumn:name="Service Account",type="string",JSONPath=".spec.serviceAccountName"
+//+kubebuilder:printcolumn:name="Rollout Strategy",type="string",JSONPath=".spec.rolloutStrategy"
+//+kubebuilder:printcolumn:name="Creation Timestamp",type="date",JSONPath=".metadata.creationTimestamp"
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // +kubebuilder:object:root=true
diff --git a/config/.DS_Store b/config/.DS_Store
index 759eb6679f714d2a06b6a82709a15091ef90687a..99d95a3fea83c8f1b158138d205668c9d9c309d7 100644
GIT binary patch
delta 329
zcmZp1XmQw}B487`ih+TFnIV~>h#@66-^C><CqD@&!trCrUJ;xBM;(!6Q_y55CkVvo
z+|s+K(Ypq$kewlgA(bJGA(5e!A%~$PHy@z^qH6LBffSv|wn!Rsfr|5hI31|52w4L}
z)#M7n9JZUmAPtjW397)DB0?o>vN2%MJ|Q&(Q)==RAs4oom0%e;VJR5XPB>1-cQ=x?
z#Xu`_847@|Ol2rWwicpl@(E!NCi$h4ZA2s{Yl(2N>7N3dXeFWoW2T6xF(z#87OCV0
E0INoAo&W#<

delta 329
zcmZp1XmQw}B486($H2hA%#h4b#E_Dk@8Xh_lb-|>;ka3AS$?(ks3Wp$3YzTX1c4YG
z_x{HAuBBjw><lRksSIfhi43I-ISeJa`3MaVRg+%`r0B3tMbeN9RGbII=|GJ|$QmH3
zCRYgNuxZ8_<!@g&`IVpwj42{i!geVYEZQfehG0rfz9QtpmNFY;!DKmMDHzjEI8G<a
zFhQ<<2GpI!Kr3?@3V^OmWhh3r7NTnM31JT=_JxyeL?k9_iEy#0OI|(owt2FZhzg9E
OBBI9Vu(?~Lk{bZ_e`!7d

diff --git a/config/crd/bases/one-click.dev_rollouts.yaml b/config/crd/bases/one-click.dev_rollouts.yaml
index 569c954..1ffcd8a 100644
--- a/config/crd/bases/one-click.dev_rollouts.yaml
+++ b/config/crd/bases/one-click.dev_rollouts.yaml
@@ -28,6 +28,24 @@ spec:
     - jsonPath: .status.deployment.status
       name: Deployment Status
       type: string
+    - jsonPath: .status.services[*].status
+      name: Service Status
+      type: string
+    - jsonPath: .status.ingresses[*].status
+      name: Ingress Status
+      type: string
+    - jsonPath: .status.volumes[*].status
+      name: Volume Status
+      type: string
+    - jsonPath: .spec.serviceAccountName
+      name: Service Account
+      type: string
+    - jsonPath: .spec.rolloutStrategy
+      name: Rollout Strategy
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Creation Timestamp
+      type: date
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -257,6 +275,8 @@ spec:
                 - limits
                 - requests
                 type: object
+              rolloutStrategy:
+                type: string
               secrets:
                 items:
                   properties:
diff --git a/controllers/deployment.go b/controllers/deployment.go
index ec261ad..393a98f 100644
--- a/controllers/deployment.go
+++ b/controllers/deployment.go
@@ -77,6 +77,22 @@ func (r *RolloutReconciler) deploymentForRollout(ctx context.Context, f *oneclic
 		}
 	}
 
+	// Determine the rollout strategy
+	strategy := appsv1.DeploymentStrategy{
+		Type: appsv1.RollingUpdateDeploymentStrategyType,
+	}
+
+	if f.Spec.RolloutStrategy != "" {
+		switch f.Spec.RolloutStrategy {
+		case "recreate":
+			strategy.Type = appsv1.RecreateDeploymentStrategyType
+		case "rollingUpdate":
+			strategy.Type = appsv1.RollingUpdateDeploymentStrategyType
+		default:
+			strategy.Type = appsv1.RollingUpdateDeploymentStrategyType
+		}
+	}
+
 	dep := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      f.Name,
@@ -102,6 +118,7 @@ func (r *RolloutReconciler) deploymentForRollout(ctx context.Context, f *oneclic
 					ImagePullSecrets:   imagePullSecrets,
 				},
 			},
+			Strategy: strategy,
 		},
 	}
 
@@ -267,6 +284,35 @@ func needsUpdate(current *appsv1.Deployment, f *oneclickiov1alpha1.Rollout) bool
 		return true
 	}
 
+	// Check command
+	if !reflect.DeepEqual(current.Spec.Template.Spec.Containers[0].Command, f.Spec.Command) {
+		return true
+	}
+
+	// Check args
+	if !reflect.DeepEqual(current.Spec.Template.Spec.Containers[0].Args, f.Spec.Args) {
+		return true
+	}
+
+	// Check rollout strategy
+	strategy := appsv1.DeploymentStrategy{
+		Type: appsv1.RollingUpdateDeploymentStrategyType,
+	}
+	if f.Spec.RolloutStrategy != "" {
+		switch f.Spec.RolloutStrategy {
+		case "recreate":
+			strategy.Type = appsv1.RecreateDeploymentStrategyType
+		case "rollingUpdate":
+			strategy.Type = appsv1.RollingUpdateDeploymentStrategyType
+		default:
+			strategy.Type = appsv1.RollingUpdateDeploymentStrategyType
+		}
+	}
+
+	if !reflect.DeepEqual(current.Spec.Strategy, strategy) {
+		return true
+	}
+
 	// Add more checks as necessary, e.g., labels, annotations, specific configuration, etc.
 
 	return false