@@ -54,7 +54,7 @@ OPERATOR_SDK_VERSION ?= v1.41.0
 # the dev image generated using command `make build-feature-server-dev-docker`
 IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
 FS_IMG ?= quay.io/feastdev/feature-server:$(VERSION)
-CJ_IMG ?= quay.io/openshift/origin-cli:4.17
+CJ_IMG ?= registry.k8s.io/kubectl:v1.35.9
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.31.0
 
 
@@ -472,7 +472,7 @@ spec:
                 - name: RELATED_IMAGE_FEATURE_SERVER
                   value: quay.io/feastdev/feature-server:0.66.0
                 - name: RELATED_IMAGE_CRON_JOB
-                  value: quay.io/openshift/origin-cli:4.17
+                  value: registry.k8s.io/kubectl:v1.35.9
                 - name: GOMEMLIMIT
                   value: 230MiB
                 - name: OIDC_ISSUER_URL
@@ -568,6 +568,6 @@ spec:
   relatedImages:
   - image: quay.io/feastdev/feature-server:0.66.0
     name: feature-server
-  - image: quay.io/openshift/origin-cli:4.17
+  - image: registry.k8s.io/kubectl:v1.35.9
     name: cron-job
   version: 0.66.0
@@ -11,4 +11,4 @@ spec:
         - name: RELATED_IMAGE_FEATURE_SERVER
           value: quay.io/feastdev/feature-server:0.66.0
         - name: RELATED_IMAGE_CRON_JOB
-          value: quay.io/openshift/origin-cli:4.17
+          value: registry.k8s.io/kubectl:v1.35.9
@@ -78,7 +78,7 @@ spec:
         - name: RELATED_IMAGE_FEATURE_SERVER
           value: feast:latest
         - name: RELATED_IMAGE_CRON_JOB
-          value: origin-cli:latest
+          value: registry.k8s.io/kubectl:v1.35.9
         # Injected from params.env via kustomize replacements (ODH/RHOAI overlays).
         # Open Data Hub operator sets this from GatewayConfig when the cluster uses external OIDC.
         - name: OIDC_ISSUER_URL
 
@@ -1,5 +1,5 @@
 RELATED_IMAGE_FEAST_OPERATOR=quay.io/feastdev/feast-operator:0.66.0
 RELATED_IMAGE_FEATURE_SERVER=quay.io/feastdev/feature-server:0.66.0
-RELATED_IMAGE_CRON_JOB=quay.io/openshift/origin-cli:4.17
+RELATED_IMAGE_CRON_JOB=registry.k8s.io/kubectl:v1.35.9
 # Set at deploy time by the Open Data Hub operator from GatewayConfig (external OIDC).
 OIDC_ISSUER_URL=
@@ -24609,7 +24609,7 @@ spec:
         - name: RELATED_IMAGE_FEATURE_SERVER
           value: quay.io/feastdev/feature-server:0.66.0
         - name: RELATED_IMAGE_CRON_JOB
-          value: quay.io/openshift/origin-cli:4.17
+          value: registry.k8s.io/kubectl:v1.35.9
         - name: GOMEMLIMIT
           value: 230MiB
         - name: OIDC_ISSUER_URL
 
@@ -155,7 +155,7 @@ func (feast *FeastServices) getCronJobPodSpec() corev1.PodSpec {
 		},
 	}
 	// On vanilla Kubernetes (e.g. Kind) we must set an explicit non-root UID
-	// because the default CronJob image (origin-cli) runs as root.
+	// because the default CronJob image (registry.k8s.io/kubectl) runs as root.
 	// On OpenShift the restricted-v2 SCC auto-assigns a UID from the
 	// namespace's allowed range, so we must NOT set RunAsUser.
 	if !IsOpenShift() {
 
@@ -186,7 +186,7 @@ const (
 
 var (
 	DefaultImage          = "quay.io/feastdev/feature-server:" + feastversion.FeastVersion
-	DefaultCronJobImage   = "quay.io/openshift/origin-cli:4.17"
+	DefaultCronJobImage   = "registry.k8s.io/kubectl:v1.35.9"
 	DefaultPVCAccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}
 	NameLabelKey          = feastdevv1.GroupVersion.Group + "/name"
 	ServiceTypeLabelKey   = feastdevv1.GroupVersion.Group + "/service-type"
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func (feast *FeastServices) getCronJobPodSpec() corev1.PodSpec {`
`155`	`155`	`},`
`156`	`156`	`}`
`157`	`157`	`// On vanilla Kubernetes (e.g. Kind) we must set an explicit non-root UID`
`158`		`- // because the default CronJob image (origin-cli) runs as root.`
	`158`	`+ // because the default CronJob image (registry.k8s.io/kubectl) runs as root.`
`159`	`159`	`// On OpenShift the restricted-v2 SCC auto-assigns a UID from the`
`160`	`160`	`// namespace's allowed range, so we must NOT set RunAsUser.`
`161`	`161`	`if !IsOpenShift() {`