fix: image pull policy

Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Jan 5, 2025 · 9e80098 · 9e80098
1 parent a0c6613
commit 9e80098
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/charts/fsm/templates/fsm-deployment.yaml b/charts/fsm/templates/fsm-deployment.yaml
@@ -41,12 +41,13 @@ spec:
       initContainers:
         - name: init-fsm-controller
           image: "{{ include "fsmCurl.image" . }}"
+          imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
           command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
           resources:
             {{- toYaml .Values.fsm.fsmController.initResources | nindent 12 }}
         - name: init-untar
           image: "{{ include "fsmCurl.image" . }}"
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
           command:
           - sh
           - -c

diff --git a/charts/fsm/templates/fsm-ingress-deployment.yaml b/charts/fsm/templates/fsm-ingress-deployment.yaml
@@ -37,7 +37,7 @@ spec:
       initContainers:
       - name: wait-controller
         image: "{{ include "fsmCurl.image" . }}"
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
         {{- with .Values.fsm.fsmIngress.securityContext }}
         securityContext:
           {{- toYaml . | nindent 10 }}

diff --git a/charts/fsm/templates/fsm-injector-deployment.yaml b/charts/fsm/templates/fsm-injector-deployment.yaml
@@ -38,6 +38,7 @@ spec:
       initContainers:
         - name: init-fsm-injector
           image: "{{ include "fsmCurl.image" . }}"
+          imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
           command: ["curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
           resources:
             {{- toYaml .Values.fsm.injector.initResources | nindent 12 }}

diff --git a/charts/fsm/templates/fsm-xnetwork.yaml b/charts/fsm/templates/fsm-xnetwork.yaml
@@ -26,6 +26,7 @@ spec:
       initContainers:
       - name: fsm-init
         image: "{{ include "fsmCurl.image" . }}"
+        imagePullPolicy: {{ .Values.fsm.image.pullPolicy }}
         command: [ "curl", "http://fsm-bootstrap.{{ include "fsm.namespace" . }}:9091/healthz", "--connect-timeout", "2", "--retry", "50", "--retry-connrefused", "--retry-delay", "5"]
         resources:
           {{- toYaml .Values.fsm.fsmXnetwork.initResources | nindent 12 }}

diff --git a/tests/framework/common.go b/tests/framework/common.go
@@ -278,7 +278,7 @@ func (td *FsmTestData) InitTestData(t GinkgoTInterface) error {
 	}
 
 	if td.InstType == K3dCluster && td.ClusterConfig == nil {
-		k3dLogger.Logger.SetLevel(logrus.TraceLevel)
+		k3dLogger.Logger.SetLevel(logrus.DebugLevel)
 		clusterConfig := td.k3dClusterConfig()
 		if clusterConfig == nil {
 			return fmt.Errorf("failed to create k3d cluster")
@@ -679,7 +679,7 @@ func (td *FsmTestData) LoadImagesToK3d(imageNames []string) error {
 	}
 
 	td.T.Logf("Importing image(s) into cluster '%s'", td.ClusterName)
-	loadImageOpts := k3d.ImageImportOpts{KeepTar: false, KeepToolsNode: false, Mode: k3d.ImportModeAutoDetect}
+	loadImageOpts := k3d.ImageImportOpts{KeepTar: false, KeepToolsNode: false, Mode: k3d.ImportModeDirect}
 	if err := k3dClient.ImageImportIntoClusterMulti(context.TODO(), runtimes.SelectedRuntime, images, kc, loadImageOpts); err != nil {
 		td.T.Errorf("Failed to import image(s) into cluster '%s': %+v", td.ClusterName, err)
 		return err
@@ -822,7 +822,7 @@ func (td *FsmTestData) InstallFSM(instOpts InstallFSMOpts) error {
 			fmt.Sprintf("fsm.certmanager.issuerGroup=%s", instOpts.CertmanagerIssuerGroup))
 	}
 
-	if !(td.InstType == KindCluster) {
+	if !(td.InstType == KindCluster || td.InstType == K3dCluster) {
 		// Making sure the image is always pulled in registry-based testing
 		instOpts.SetOverrides = append(instOpts.SetOverrides,
 			"fsm.image.pullPolicy=Always")

diff --git a/tests/framework/k3d-cluster.yaml b/tests/framework/k3d-cluster.yaml
@@ -38,14 +38,6 @@ ports:
   - port: 4001:4001/udp
     nodeFilters:
       - loadbalancer
-#registries:
-#  use:
-#    - k3d-registry:5000
-#  config: |
-#    mirrors:
-#      "localhost:5001":
-#        endpoint:
-#          - http://k3d-registry:5000
 options:
   k3d:
     wait: true
@@ -63,14 +55,16 @@ options:
           - server:*
       - arg: --kubelet-arg=eviction-hard=imagefs.available<1%,nodefs.available<1%
         nodeFilters:
+          - server:*
           - agent:*
       - arg: --kubelet-arg=eviction-minimum-reclaim=imagefs.available=1%,nodefs.available=1%
         nodeFilters:
+          - server:*
           - agent:*
     nodeLabels:
-      - label: ingress-ready=true # same as `--k3s-node-label 'foo=bar@agent:1'` -> this results in a Kubernetes node label
+      - label: ingress-ready=true
         nodeFilters:
           - agent:*
   kubeconfig:
-    updateDefaultKubeconfig: true # add new cluster to your default Kubeconfig; same as `--kubeconfig-update-default` (default: true)
+    updateDefaultKubeconfig: true
     switchCurrentContext: true