fix: remove more stray references to removed artifacts

Signed-off-by: Glenn Marcy <homelab@glenn4u.com>

ci/container_sync.sh

@@ -54,12 +54,7 @@ declare -a container_images=(
     "library ubuntu jammy"
     "library ubuntu noble"
     "internetsystemsconsortium bind9 9.18"
-    "sonatype nexus3 3.30.0"
     "nginxinc nginx-unprivileged latest"
-    "flannel flannel-cni-plugin v1.1.2"
-    "flannel flannel v0.21.4"
-    "flannel flannel v0.21.5"
-    "flannel flannel v0.22.0"
 )
 
 retry() {

kubeinit/group_vars/kubeinit_defaults.yml

@@ -117,8 +117,6 @@ default_service_nodes_map_list:
   - haproxy
   - apache
   - registry
-  - apps
-  # - nexus
   target_order: "{{ service_node_target_order }}"
 - when_distro:
   - ocp

kubeinit/roles/kubeinit_k8s/defaults/main.yml

@@ -34,15 +34,9 @@ kubeinit_k8s_container_runtime: "cri-o"
 # kubeinit_k8s_container_runtime: "containerd"
 
 kubeinit_k8s_flannel_version: "0.25.4"
-kubeinit_k8s_flannel_cni_plugin_version: "1.4.1"
 
 kubeinit_k8s_kustomize_version: "5.4.2"
 
-# TODO:FIXME: There must be a bug in the way flannel and cri-o
-# is configured. The following parameters can not be changed at the moment.
-# This can not be changed, it needs to match
-# https://github.com/flannel-io/flannel/blob/796457b0cd4cba2025166f9625330ea905a18033/Documentation/kube-flannel.yml
-kubeinit_k8s_pod_network: 10.244.0.0
-# This is the cluster CIDR
+# This is the cluster CIDR taken from the net-conf.json in the kube-flannel-cfg configmap here:
+# https://github.com/flannel-io/flannel/releases/download/v{{ kubeinit_k8s_flannel_version }}/kube-flannel.yml
 kubeinit_k8s_pod_network_cidr: 10.244.0.0/16
-kubeinit_k8s_pod_subnet_len: 16

kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml

@@ -242,10 +242,7 @@
             ln -s /usr/bin/crio /usr/local/bin/crio
             tmp=$(mktemp)
             crioconf=$(ls /etc/cni/net.d/87-crio-bridge* | xargs realpath)
-            jq '.plugins[0].ipam.ranges[0][0].subnet = "{{ kubeinit_k8s_pod_network }}/{{ kubeinit_k8s_pod_subnet_len }}"' "$crioconf" > "$tmp" && mv -f "$tmp" "$crioconf"
-            # jq '.type = "flannel"' /etc/cni/net.d/87-crio-bridge.conf > "$tmp" && mv -f "$tmp" /etc/cni/net.d/87-crio-bridge.conf
-            # rm -rf /etc/cni/net.d/87-crio-bridge.conf
-            # echo '{"name": "crio","type": "flannel"}' > /etc/cni/net.d/10-crio.conf
+            jq '.plugins[0].ipam.ranges[0][0].subnet = "{{ kubeinit_k8s_pod_network_cidr }}"' "$crioconf" > "$tmp" && mv -f "$tmp" "$crioconf"
             cp /etc/crio/crio.conf /etc/crio/crio.conf.backup
             sed -i s/^.*default_runtime\ =\ .*$/default_runtime\ =\ \"crun\"/g /etc/crio/crio.conf
 

kubeinit/roles/kubeinit_prepare/tasks/main.yml

@@ -182,14 +182,12 @@
     kubeinit_bind_service_name: "{{ kubeinit_cluster_name }}-bind"
     kubeinit_dnsmasq_service_name: "{{ kubeinit_cluster_name }}-dnsmasq"
     kubeinit_haproxy_service_name: "{{ kubeinit_cluster_name }}-haproxy"
-    kubeinit_nexus_service_name: "{{ kubeinit_cluster_name }}-nexus"
     kubeinit_provision_service_name: "{{ kubeinit_cluster_name }}-provision"
     kubeinit_registry_service_name: "{{ kubeinit_cluster_name }}-registry"
     kubeinit_apache_service_node: "{{ kubeinit_cluster_hostvars.services['apache'] | default(None) }}"
     kubeinit_bind_service_node: "{{ kubeinit_cluster_hostvars.services['bind'] | default(None) }}"
     kubeinit_dnsmasq_service_node: "{{ kubeinit_cluster_hostvars.services['dnsmasq'] | default(None) }}"
     kubeinit_haproxy_service_node: "{{ kubeinit_cluster_hostvars.services['haproxy'] | default(None) }}"
-    kubeinit_nexus_service_node: "{{ kubeinit_cluster_hostvars.services['nexus'] | default(None) }}"
     kubeinit_provision_service_node: "{{ kubeinit_cluster_hostvars.services['provision'] }}"
     kubeinit_registry_service_node: "{{ kubeinit_cluster_hostvars.services['registry'] | default(None) }}"
   loop: "{{ ['localhost'] | union(groups['kubeinit_hypervisors']) }}"
@@ -256,17 +254,12 @@
     kubeinit_bind_service_address: "{{ hostvars[kubeinit_bind_service_node].ansible_host | default(None) }}"
     kubeinit_dnsmasq_service_address: "{{ hostvars[kubeinit_dnsmasq_service_node].ansible_host | default(None) }}"
     kubeinit_haproxy_service_address: "{{ hostvars[kubeinit_haproxy_service_node].ansible_host | default(None) }}"
-    kubeinit_nexus_service_address: "{{ hostvars[kubeinit_nexus_service_node].ansible_host | default(None) }}"
     kubeinit_provision_service_address: "{{ hostvars[kubeinit_provision_service_node].ansible_host }}"
     kubeinit_registry_service_address: "{{ hostvars[kubeinit_registry_service_node].ansible_host | default(None) }}"
     kubeinit_service_user: "root"
     kubeinit_service_user_dir: "/root"
     kubeinit_ingress_hostname: "ingress"
     kubeinit_bind_volume_name: "{{ kubeinit_bind_service_name }}-config"
-    kubeinit_nexus_port: "5001"
-    kubeinit_nexus_fqdn: "{{ kubeinit_nexus_service_node }}.{{ kubeinit_cluster_fqdn }}"
-    kubeinit_nexus_fqdn_alt: "nexus.{{ kubeinit_cluster_fqdn }}"
-    kubeinit_nexus_uri: "{{ kubeinit_nexus_service_node }}.{{ kubeinit_cluster_fqdn }}:5001"
     kubeinit_registry_port: "5000"
     kubeinit_registry_fqdn: "{{ kubeinit_registry_service_node }}.{{ kubeinit_cluster_fqdn }}"
     kubeinit_registry_fqdn_alt: "registry.{{ kubeinit_cluster_fqdn }}"

kubeinit/roles/kubeinit_services/tasks/start_services_containers.yml

@@ -45,15 +45,6 @@
         public: true
       when: "'haproxy' in hostvars[kubeinit_deployment_node_name].services"
 
-    #
-    # Configure Nexus
-    #
-    - name: Configure Nexus
-      ansible.builtin.include_role:
-        name: kubeinit.kubeinit.kubeinit_nexus
-        public: true
-      when: "'nexus' in hostvars[kubeinit_deployment_node_name].services"
-
     #
     # Configure httpd
     #