From f5a38474cd90e54bb780e313a9ab15be359a3c8c Mon Sep 17 00:00:00 2001
From: lauk001 <liukuo@kylinos.cn>
Date: Fri, 8 Sep 2023 15:52:26 +0800
Subject: [PATCH] add housekeeper configuration

---
 app/cmd/phases/initconfig/ign.go              |  1 +
 .../operator/config/manager/manager.yaml      | 37 +++++++++++++++++++
 .../housekeeper.io_v1alpha1_update.yaml       |  4 +-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/cmd/phases/initconfig/ign.go b/app/cmd/phases/initconfig/ign.go
index 3f5f2c8..6a86eb7 100644
--- a/app/cmd/phases/initconfig/ign.go
+++ b/app/cmd/phases/initconfig/ign.go
@@ -128,6 +128,7 @@ func getMasterTmplData(nkdConfig *nkd.Master, count int, ip string, hsip string)
 		Hsip:            hsip,
 		ImageRegistry:   nkdConfig.Repo.Registry,
 		PauseImageTag:   nkdConfig.ContainerDaemon.PauseImageTag,
+		KubeVersion:     nkdConfig.Kubeadm.KubernetesVersion,
 		ServiceSubnet:   nkdConfig.Kubeadm.Networking.ServiceSubnet,
 		PodSubnet:       nkdConfig.Kubeadm.Networking.PodSubnet,
 		Token:           "abcdef.0123456789abcdef",
diff --git a/housekeeper/operator/config/manager/manager.yaml b/housekeeper/operator/config/manager/manager.yaml
index 7544d7c..702b8ce 100644
--- a/housekeeper/operator/config/manager/manager.yaml
+++ b/housekeeper/operator/config/manager/manager.yaml
@@ -24,6 +24,7 @@ spec:
       - command:
         - /housekeeper-operator-manager
         image: housekeeper-operator:latest
+        imagePullPolicy: Always
         name: housekeeper-operator-manager
         securityContext:
           allowPrivilegeEscalation: false
@@ -40,3 +41,39 @@ spec:
       tolerations:
         - key: "node-role.kubernetes.io/master"
           operator: "Exists"
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: housekeeper-controller-manager
+  namespace: housekeeper-system
+  labels:
+    control-plane: housekeeper-controller-manager
+spec:
+  selector:
+    matchLabels:
+      control-plane: housekeeper-controller-manager
+  template:
+    metadata:
+      labels:
+        control-plane: housekeeper-controller-manager
+    spec:
+      containers:
+       - name: housekeeper-controller-manager
+         command:
+          - /housekeeper-controller-manager
+         image: housekeeper-controller:latest
+         imagePullPolicy: Always
+         volumeMounts:
+          - name: upgrade-daemon
+            mountPath: /var/run/housekeeper-daemon
+         env:
+          - name: NODE_NAME
+            valueFrom:
+             fieldRef:
+              apiVersion: v1
+              fieldPath: spec.nodeName
+      volumes:
+        - name: upgrade-daemon
+          hostPath:
+            path: /var/run/housekeeper-daemon
\ No newline at end of file
diff --git a/housekeeper/operator/config/samples/housekeeper.io_v1alpha1_update.yaml b/housekeeper/operator/config/samples/housekeeper.io_v1alpha1_update.yaml
index b6106bb..c9c009f 100644
--- a/housekeeper/operator/config/samples/housekeeper.io_v1alpha1_update.yaml
+++ b/housekeeper/operator/config/samples/housekeeper.io_v1alpha1_update.yaml
@@ -1,8 +1,10 @@
 apiVersion: housekeeper.io/v1alpha1
 kind: Update
 metadata:
-  name: update-sample
+  name: housekeeper-upgrade
 spec:
   osVersion: os.version
   osImageURL: image.url
   kubeVersion: kubernetes.version
+  evictPodForce: false
+  maxUnavailable: 2
\ No newline at end of file
-- 
Gitee