use fallback nodeslist if still pulling image #261 (#262)

Author: akyriako

Makefile

@@ -52,7 +52,7 @@ OPERATOR_SDK_VERSION ?= v1.39.0
 # Image URL to use all building/pushing image targets
 DOCKER_HUB_NAME ?= quay.io/akyriako#$(shell docker info | sed '/Username:/!d;s/.* //')
 IMG_NAME ?= typesense-operator
-IMG_TAG ?= 0.4.1-rc.1
+IMG_TAG ?= 0.4.1-rc.2
 IMG ?= $(DOCKER_HUB_NAME)/$(IMG_NAME):$(IMG_TAG)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

README.md

@@ -228,7 +228,7 @@ Join the conversation:
 ## 📦 Project Status
 
 TyKO is an **independently maintained** project (not affiliated with Typesense, Inc.).
-- Latest version: **0.4.1-rc.1**
+- Latest version: **0.4.1-rc.2**
 - Tested on: Kubernetes 1.35 (earliest 1.26), Typesense 30.0 (earliest 26.0)
 - Contributions welcome! See [FAQ](https://akyriako.github.io/typesense-operator-docs/docs/faq) and [Development](https://akyriako.github.io/typesense-operator-docs/docs/development)
 

charts/typesense-operator/Chart.yaml

@@ -14,12 +14,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1-rc.1
+version: 0.4.1-rc.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.1-rc.1"
+appVersion: "0.4.1-rc.2"
 
 maintainers:
   - name: Kyriakos Akriotis

charts/typesense-operator/values.yaml

@@ -12,7 +12,7 @@ controllerManager:
         - ALL
     image:
       repository: quay.io/akyriako/typesense-operator
-      tag: 0.4.1-rc.1
+      tag: 0.4.1-rc.2
     imagePullPolicy: IfNotPresent
     resources:
       limits:

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/akyriako/typesense-operator
-  newTag: 0.4.1-rc.1
+  newTag: 0.4.1-rc.2

internal/controller/typesensecluster_configmap.go

@@ -260,17 +260,36 @@ func (r *TypesenseClusterReconciler) getNodes(ctx context.Context, ts *tsv1alpha
 		}
 
 		for _, pod := range pods.Items {
+			markAsScheduled := false
+			// mark the pod as unscheduled if it's still pulling the image
+			for _, cs := range append(pod.Status.InitContainerStatuses, pod.Status.ContainerStatuses...) {
+				if cs.State.Waiting == nil {
+					continue
+				}
+
+				switch cs.State.Waiting.Reason {
+				case "ContainerCreating", "ErrImagePull", "ImagePullBackOff":
+					markAsScheduled = true
+					break
+				}
+			}
+
 			if pod.Status.Phase != v1.PodPending {
 				continue
 			}
+
 			for _, cond := range pod.Status.Conditions {
 				if cond.Type == v1.PodScheduled &&
 					cond.Status == v1.ConditionFalse &&
 					cond.Reason == v1.PodReasonUnschedulable {
-					unscheduledPods++
+					markAsScheduled = true
 					break
 				}
 			}
+
+			if markAsScheduled {
+				unscheduledPods++
+			}
 		}
 
 		targetReplicas = ptr.Deref[int32](sts.Spec.Replicas, 1)