wip: cleanup calico install

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

Makefile.d/calico/deploy/daemonset.yaml

@@ -47,8 +47,7 @@ spec:
         # It can be deleted if this is a fresh installation, or if you have already
         # upgraded to use calico-ipam.
         - name: upgrade-ipam
-          image: ghcr.io/converged-computing/usernetes:calico-cni
-          # image: quay.io/calico/cni:v3.31.3
+          image: quay.io/calico/cni:v3.31.3
           imagePullPolicy: IfNotPresent
           command: ["/opt/cni/bin/calico-ipam", "-upgrade"]
           envFrom:
@@ -76,8 +75,7 @@ spec:
         # This container installs the CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: ghcr.io/converged-computing/usernetes:calico-cni
-          # image: quay.io/calico/cni:v3.31.3
+          image: quay.io/calico/cni:v3.31.3
           imagePullPolicy: IfNotPresent
           command: ["/opt/cni/bin/install"]
           envFrom:
@@ -121,7 +119,6 @@ spec:
         # networking to allow communication with the API Server. Calico-node initialization is executed
         # in best effort fashion, i.e. no failure for errors, to not disrupt pod creation in iptables mode.
         - name: "ebpf-bootstrap"
-          # image: ghcr.io/converged-computing/usernetes:calico-node
           image: quay.io/calico/node:v3.31.3
           imagePullPolicy: IfNotPresent
           command: ["calico-node", "-init", "-best-effort"]
@@ -148,7 +145,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: ghcr.io/converged-computing/usernetes:calico-node
+          image: quay.io/calico/node:v3.31.3
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:

Makefile.d/calico/deploy/deployment.yaml

@@ -39,8 +39,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: calico-kube-controllers
-          image: ghcr.io/converged-computing/usernetes:calico-kube-controllers
-          # image: quay.io/calico/kube-controllers:v3.31.3
+          image: quay.io/calico/kube-controllers:v3.31.3
           imagePullPolicy: IfNotPresent
           env:
             # Choose which controllers to run.

Makefile.d/calico/install-calico.sh

@@ -13,13 +13,6 @@ kubectl delete deployments.apps -n kube-system calico-kube-controllers
 kubectl delete cm -n kube-system calico-config
 kubectl delete daemonsets.apps -n kube-system calico-node
 
-# These are for our corona images
-yq eval -i '(.spec.template.spec.initContainers[] | select(.name == "upgrade-ipam") | .image) = "ghcr.io/converged-computing/usernetes:calico-cni"' ./Makefile.d/calico/deploy/daemonset.yaml
-yq eval -i '(.spec.template.spec.initContainers[] | select(.name == "install-cni") | .image) = "ghcr.io/converged-computing/usernetes:calico-cni"' ./Makefile.d/calico/deploy/daemonset.yaml
-yq eval -i '(.spec.template.spec.initContainers[] | select(.name == "ebpf-bootstrap") | .image) = "ghcr.io/converged-computing/usernetes:calico-node"' ./Makefile.d/calico/deploy/daemonset.yaml
-yq eval -i '(.spec.template.spec.containers[] | select(.name == "calico-node") | .image) = "ghcr.io/converged-computing/usernetes:calico-node"' ./Makefile.d/calico/deploy/daemonset.yaml
-yq eval -i '(.spec.template.spec.containers[] | select(.name == "calico-kube-controllers") | .image) = "ghcr.io/converged-computing/usernetes:calico-kube-controllers"' ./Makefile.d/calico/deploy/deployment.yaml
-
 # Update components with our version
 # Note that IP autodetect has to initially be there so the vxlan.calico shows up
 kubectl apply -f ./Makefile.d/calico/deploy