Use native sleep prestophook instead of exec-ing sleep 5 (#571)

* Fixes #538 * Use native sleep PreStopHook instead of exec-ing `sleep 5` * Upgrade test suite to Kubernetes 1.30
nais · Oct 22, 2024 · 51b703d · 51b703d
1 parent 57b45f5
commit 51b703d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ NAME        := naiserator
 TAG         := navikt/${NAME}
 LATEST      := ${TAG}:latest
 ROOT_DIR    := $(shell git rev-parse --show-toplevel)
-K8S_VERSION := 1.27.1
+K8S_VERSION := 1.30.0
 arch        := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/)
 os          := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 testbin_dir := ./.testbin/
@@ -50,4 +50,4 @@ proto:
 
 install-protobuf-go:
 	go install google.golang.org/protobuf/cmd/protoc-gen-go
-	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
diff --git a/pkg/resourcecreator/pod/pod.go b/pkg/resourcecreator/pod/pod.go
@@ -448,6 +448,18 @@ func copyLinkerdAnnotations(src, dst map[string]string) {
 	}
 }
 
+// The default PreStopHook will wait for five seconds before killing pods.
+// Earlier, this function was solved by "sleep 5" inside the container.
+func defaultPreStopHook() *corev1.Lifecycle {
+	return &corev1.Lifecycle{
+		PreStop: &corev1.LifecycleHandler{
+			Sleep: &corev1.SleepAction{
+				Seconds: 5,
+			},
+		},
+	}
+}
+
 // lifecycle creates lifecycle definitions, right now adding only PreStop handlers.
 //
 // preStopHookPath is the old, deprecated way of adding preStopHook definitions.
@@ -470,13 +482,7 @@ func lifecycle(preStopHookPath string, preStopHook *nais_io_v1.PreStopHook) (*co
 	}
 
 	if preStopHook == nil {
-		return &corev1.Lifecycle{
-			PreStop: &corev1.LifecycleHandler{
-				Exec: &corev1.ExecAction{
-					Command: []string{"sleep", "5"},
-				},
-			},
-		}, nil
+		return defaultPreStopHook(), nil
 	}
 
 	if preStopHook.Exec != nil && preStopHook.Http != nil {

diff --git a/pkg/resourcecreator/testdata/gcp_gar_toleration_with_non_gar_image.yaml b/pkg/resourcecreator/testdata/gcp_gar_toleration_with_non_gar_image.yaml
@@ -67,10 +67,8 @@ tests:
                     imagePullPolicy: IfNotPresent
                     lifecycle:
                       preStop:
-                        exec:
-                          command:
-                            - sleep
-                            - "5"
+                        sleep:
+                          seconds: 5
                     name: myapplication
                     ports:
                       - containerPort: 8080

diff --git a/pkg/resourcecreator/testdata/naisjob/cronjob_features_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/cronjob_features_on_premises.yaml
@@ -129,10 +129,8 @@ tests:
                         imagePullPolicy: IfNotPresent
                         lifecycle:
                           preStop:
-                            exec:
-                              command:
-                                - sleep
-                                - "5"
+                            sleep:
+                              seconds: 5
                         name: mynaisjob
                         resources:
                           limits:

diff --git a/pkg/resourcecreator/testdata/naisjob/job_features_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/job_features_on_premises.yaml
@@ -128,10 +128,8 @@ tests:
                     imagePullPolicy: IfNotPresent
                     lifecycle:
                       preStop:
-                        exec:
-                          command:
-                            - sleep
-                            - "5"
+                        sleep:
+                          seconds: 5
                     name: mynaisjob
                     resources:
                       limits:

diff --git a/pkg/resourcecreator/testdata/naisjob/vanilla_cronjob_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/vanilla_cronjob_on_premises.yaml
@@ -127,10 +127,8 @@ tests:
                         imagePullPolicy: IfNotPresent
                         lifecycle:
                           preStop:
-                            exec:
-                              command:
-                                - sleep
-                                - "5"
+                            sleep:
+                              seconds: 5
                         name: mynaisjob
                         resources:
                           limits:

diff --git a/pkg/resourcecreator/testdata/naisjob/vanilla_job_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/vanilla_job_on_premises.yaml
@@ -124,10 +124,8 @@ tests:
                     imagePullPolicy: IfNotPresent
                     lifecycle:
                       preStop:
-                        exec:
-                          command:
-                            - sleep
-                            - "5"
+                        sleep:
+                          seconds: 5
                     name: mynaisjob
                     resources:
                       limits:

diff --git a/pkg/resourcecreator/testdata/vanilla.yaml b/pkg/resourcecreator/testdata/vanilla.yaml
@@ -203,6 +203,18 @@ tests:
     kind: Deployment
     name: myapplication
     match:
+      - type: subset
+        name: "prestophook set"
+        resource:
+          spec:
+            template:
+              spec:
+                containers:
+                  - name: myapplication
+                    lifecycle:
+                      preStop:
+                        sleep:
+                          seconds: 5
       - type: subset
         name: "replicas set to 2"
         resource:

diff --git a/pkg/resourcecreator/testdata/vanilla_on_premises.yaml b/pkg/resourcecreator/testdata/vanilla_on_premises.yaml
@@ -198,10 +198,8 @@ tests:
                         name: writable-tmp
                     lifecycle:
                       preStop:
-                        exec:
-                          command:
-                            - sleep
-                            - "5"
+                        sleep:
+                          seconds: 5
                     imagePullPolicy: IfNotPresent
                     name: myapplication
                     image: navikt/myapplication:1.2.3