a bit more improvements/updates

zackbradys · Feb 24, 2024 · 5a9fa3a · 5a9fa3a
1 parent c29a0f2
commit 5a9fa3a
Show file tree

Hide file tree

Showing 12 changed files with 159 additions and 174 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ fetch -> validate -> save -> | <airgap> | -> load -> validate -> distribute
 ### Core Components
 
 - [hauler/rke2](hauler/rke2/README.md) - provides the content manifest for Rancher Kubernetes (RKE2)
-  - currently supports: `RKE2: v1.26.13`
+  - currently supports: `RKE2: v1.27.10`
 - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Cert-Manager
   - currently supports: `Cert-Manager: v1.14.2`
 - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Rancher Multi-Cluster Manager

diff --git a/examples/rancher-airgap-quickstart.md b/examples/rancher-airgap-quickstart.md
@@ -122,7 +122,7 @@ Complete the following commands on the first server node in the cluster. You wil
 sudo su
 
 ### Set Variables
-export vRKE2=1.26.13
+export vRKE2=v1.27.10+rke2r1
 export vPlatform=el9
 export registry=<FQDN or IP>:5000
 export fileserver=<FQDN or IP>:8080
@@ -227,7 +227,7 @@ Complete the following commands on the agent node(s) in the cluster. You will ne
 sudo su
 
 ### Set Variables
-export vRKE2=v1.26.13
+export vRKE2=v1.27.10+rke2r1
 export vPlatform=el9
 export registry=<FQDN or IP>:5000
 export fileserver=<FQDN or IP>:8080

diff --git a/hauler/harbor/rancher-airgap-harbor.yaml b/hauler/harbor/rancher-airgap-harbor.yaml
@@ -14,13 +14,4 @@ metadata:
   name: rancher-airgap-images-harbor
 spec:
   images:
-    - name: goharbor/harbor-core:v2.10.0
-    - name: goharbor/harbor-jobservice:v2.10.0
-    - name: goharbor/harbor-portal:v2.10.0
-    - name: goharbor/registry-photon:v2.10.0
-    - name: goharbor/harbor-registryctl:v2.10.0
-    - name: goharbor/harbor-db:v2.10.0
-    - name: goharbor/harbor-db:v2.10.0
-    - name: goharbor/harbor-db:v2.10.0
-    - name: goharbor/redis-photon:v2.10.0
-    - name: goharbor/trivy-adapter-photon:v2.10.0
+
diff --git a/hauler/harvester/rancher-airgap-harvester.yaml b/hauler/harvester/rancher-airgap-harvester.yaml
@@ -21,36 +21,36 @@ metadata:
   name: rancher-airgap-images-harvester
 spec:
   images:
-    - name: docker.io/library/alpine:3
-    - name: docker.io/library/busybox:1.32.0
-    - name: docker.io/longhornio/backing-image-manager:v1.4.3
-    - name: docker.io/longhornio/csi-attacher:v3.4.0
-    - name: docker.io/longhornio/csi-node-driver-registrar:v2.5.0
-    - name: docker.io/longhornio/csi-provisioner:v2.1.2
-    - name: docker.io/longhornio/csi-resizer:v1.3.0
-    - name: docker.io/longhornio/csi-snapshotter:v5.0.1
-    - name: docker.io/longhornio/livenessprobe:v2.8.0
-    - name: docker.io/longhornio/longhorn-engine:v1.4.3
-    - name: docker.io/longhornio/longhorn-instance-manager:v1.4.3
-    - name: docker.io/longhornio/longhorn-manager:v1.4.3
-    - name: docker.io/longhornio/longhorn-share-manager:v1.4.3
-    - name: docker.io/longhornio/longhorn-ui:v1.4.3
-    - name: docker.io/longhornio/support-bundle-kit:v0.0.25
-    - name: docker.io/rancher/harvester-eventrouter:v0.1.1
-    - name: docker.io/rancher/harvester-load-balancer-webhook:v0.2.1
-    - name: docker.io/rancher/harvester-load-balancer:v0.2.1
-    - name: docker.io/rancher/harvester-network-controller:v0.3.4
-    - name: docker.io/rancher/harvester-network-helper:v0.3.4
-    - name: docker.io/rancher/harvester-network-webhook:v0.3.4
-    - name: docker.io/rancher/harvester-node-disk-manager:v0.5.1
-    - name: docker.io/rancher/harvester-node-manager:v0.1.7
-    - name: docker.io/rancher/harvester-pcidevices:v0.2.5
-    - name: docker.io/rancher/harvester-seeder:v0.1.0
-    - name: docker.io/rancher/harvester-upgrade:v1.2.1
-    - name: docker.io/rancher/harvester-vm-import-controller:v0.1.5
-    - name: docker.io/rancher/harvester-webhook:v1.2.1
-    - name: docker.io/rancher/harvester:v1.2.1
-    - name: docker.io/rancher/support-bundle-kit:v0.0.28
+    - name: library/alpine:3
+    - name: library/busybox:1.32.0
+    - name: longhornio/backing-image-manager:v1.4.3
+    - name: longhornio/csi-attacher:v3.4.0
+    - name: longhornio/csi-node-driver-registrar:v2.5.0
+    - name: longhornio/csi-provisioner:v2.1.2
+    - name: longhornio/csi-resizer:v1.3.0
+    - name: longhornio/csi-snapshotter:v5.0.1
+    - name: longhornio/livenessprobe:v2.8.0
+    - name: longhornio/longhorn-engine:v1.4.3
+    - name: longhornio/longhorn-instance-manager:v1.4.3
+    - name: longhornio/longhorn-manager:v1.4.3
+    - name: longhornio/longhorn-share-manager:v1.4.3
+    - name: longhornio/longhorn-ui:v1.4.3
+    - name: longhornio/support-bundle-kit:v0.0.25
+    - name: rancher/harvester-eventrouter:v0.1.1
+    - name: rancher/harvester-load-balancer-webhook:v0.2.1
+    - name: rancher/harvester-load-balancer:v0.2.1
+    - name: rancher/harvester-network-controller:v0.3.4
+    - name: rancher/harvester-network-helper:v0.3.4
+    - name: rancher/harvester-network-webhook:v0.3.4
+    - name: rancher/harvester-node-disk-manager:v0.5.1
+    - name: rancher/harvester-node-manager:v0.1.7
+    - name: rancher/harvester-pcidevices:v0.2.5
+    - name: rancher/harvester-seeder:v0.1.0
+    - name: rancher/harvester-upgrade:v1.2.1
+    - name: rancher/harvester-vm-import-controller:v0.1.5
+    - name: rancher/harvester-webhook:v1.2.1
+    - name: rancher/harvester:v1.2.1
+    - name: rancher/support-bundle-kit:v0.0.28
     - name: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.6.2-amd64
     - name: ghcr.io/kube-vip/kube-vip-iptables:v0.6.0
     - name: registry.k8s.io/sig-storage/snapshot-controller:v5.0.1
@@ -63,54 +63,54 @@ spec:
     - name: registry.suse.com/suse/sles/15.4/virt-launcher:0.54.0-150400.3.19.1
     - name: registry.suse.com/suse/sles/15.4/virt-operator:0.54.0-150400.3.19.1
     - name: registry.suse.com/suse/vmdp/vmdp:2.5.4.2
-    - name: docker.io/rancher/harvester-cluster-repo:v1.2.1
-    - name: docker.io/rancher/fleet-agent:v0.7.0
-    - name: docker.io/rancher/fleet:v0.7.0
-    - name: docker.io/rancher/gitjob:v0.1.54
-    - name: docker.io/rancher/kubectl:v1.20.2
-    - name: docker.io/rancher/kubectl:v1.21.5
-    - name: docker.io/rancher/mirrored-grafana-grafana:9.1.5
-    - name: docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1
-    - name: docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.3.0
-    - name: docker.io/rancher/mirrored-kiwigrid-k8s-sidecar:1.19.2
-    - name: docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0
-    - name: docker.io/rancher/mirrored-library-busybox:1.31.1
-    - name: docker.io/rancher/mirrored-library-nginx:1.21.1-alpine
-    - name: docker.io/rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.10.0
-    - name: docker.io/rancher/mirrored-prometheus-node-exporter:v1.3.1
-    - name: docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.59.1
-    - name: docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.59.1
-    - name: docker.io/rancher/mirrored-prometheus-prometheus:v2.38.0
-    - name: docker.io/rancher/mirrored-prometheus-alertmanager:v0.24.0
-    - name: docker.io/rancher/rancher-webhook:v0.3.5
-    - name: docker.io/rancher/rancher:v2.7.5
-    - name: docker.io/rancher/shell:v0.1.8
-    - name: docker.io/rancher/shell:v0.1.18
-    - name: docker.io/rancher/shell:v0.1.20
-    - name: docker.io/rancher/system-agent:v0.3.3-suc
-    - name: docker.io/rancher/system-upgrade-controller:v0.11.0
-    - name: docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
-    - name: docker.io/rancher/mirrored-banzaicloud-logging-operator:3.17.10
-    - name: docker.io/rancher/mirrored-fluent-fluent-bit:1.9.5
-    - name: docker.io/rancher/mirrored-jimmidyson-configmap-reload:v0.4.0
-    - name: docker.io/rancher/system-agent-installer-rancher:v2.7.5
-    - name: docker.io/rancher/system-agent-installer-rke2:v1.25.9-rke2r1
-    - name: docker.io/rancher/hardened-cni-plugins:v1.0.1-build20221011
-    - name: docker.io/rancher/hardened-multus-cni:v3.9.3-build20230109
-    - name: docker.io/rancher/rke2-runtime:v1.25.9-rke2r1
-    - name: docker.io/rancher/hardened-kubernetes:v1.25.9-rke2r1-build20230412
-    - name: docker.io/rancher/hardened-coredns:v1.10.1-build20230406
-    - name: docker.io/rancher/hardened-cluster-autoscaler:v1.8.6-build20230406
-    - name: docker.io/rancher/hardened-dns-node-cache:1.22.20-build20230406
-    - name: docker.io/rancher/hardened-etcd:v3.5.7-k3s1-build20230406
-    - name: docker.io/rancher/hardened-k8s-metrics-server:v0.6.2-build20221202
-    - name: docker.io/rancher/klipper-helm:v0.7.6-build20230223
-    - name: docker.io/rancher/klipper-lb:v0.4.3
-    - name: docker.io/rancher/pause:3.6
-    - name: docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794
-    - name: docker.io/rancher/nginx-ingress-controller:nginx-1.6.4-hardened4
-    - name: docker.io/rancher/rke2-cloud-provider:v1.26.3-build20230406
-    - name: docker.io/rancher/mirrored-sig-storage-snapshot-controller:v6.2.1
-    - name: docker.io/rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.1
-    - name: docker.io/rancher/hardened-calico:v3.25.0-build20230209
-    - name: docker.io/rancher/hardened-flannel:v0.21.3-build20230308
+    - name: rancher/harvester-cluster-repo:v1.2.1
+    - name: rancher/fleet-agent:v0.7.0
+    - name: rancher/fleet:v0.7.0
+    - name: rancher/gitjob:v0.1.54
+    - name: rancher/kubectl:v1.20.2
+    - name: rancher/kubectl:v1.21.5
+    - name: rancher/mirrored-grafana-grafana:9.1.5
+    - name: rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1
+    - name: rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.3.0
+    - name: rancher/mirrored-kiwigrid-k8s-sidecar:1.19.2
+    - name: rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0
+    - name: rancher/mirrored-library-busybox:1.31.1
+    - name: rancher/mirrored-library-nginx:1.21.1-alpine
+    - name: rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.10.0
+    - name: rancher/mirrored-prometheus-node-exporter:v1.3.1
+    - name: rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.59.1
+    - name: rancher/mirrored-prometheus-operator-prometheus-operator:v0.59.1
+    - name: rancher/mirrored-prometheus-prometheus:v2.38.0
+    - name: rancher/mirrored-prometheus-alertmanager:v0.24.0
+    - name: rancher/rancher-webhook:v0.3.5
+    - name: rancher/rancher:v2.7.5
+    - name: rancher/shell:v0.1.8
+    - name: rancher/shell:v0.1.18
+    - name: rancher/shell:v0.1.20
+    - name: rancher/system-agent:v0.3.3-suc
+    - name: rancher/system-upgrade-controller:v0.11.0
+    - name: rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
+    - name: rancher/mirrored-banzaicloud-logging-operator:3.17.10
+    - name: rancher/mirrored-fluent-fluent-bit:1.9.5
+    - name: rancher/mirrored-jimmidyson-configmap-reload:v0.4.0
+    - name: rancher/system-agent-installer-rancher:v2.7.5
+    - name: rancher/system-agent-installer-rke2:v1.25.9-rke2r1
+    - name: rancher/hardened-cni-plugins:v1.0.1-build20221011
+    - name: rancher/hardened-multus-cni:v3.9.3-build20230109
+    - name: rancher/rke2-runtime:v1.25.9-rke2r1
+    - name: rancher/hardened-kubernetes:v1.25.9-rke2r1-build20230412
+    - name: rancher/hardened-coredns:v1.10.1-build20230406
+    - name: rancher/hardened-cluster-autoscaler:v1.8.6-build20230406
+    - name: rancher/hardened-dns-node-cache:1.22.20-build20230406
+    - name: rancher/hardened-etcd:v3.5.7-k3s1-build20230406
+    - name: rancher/hardened-k8s-metrics-server:v0.6.2-build20221202
+    - name: rancher/klipper-helm:v0.7.6-build20230223
+    - name: rancher/klipper-lb:v0.4.3
+    - name: rancher/pause:3.6
+    - name: rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794
+    - name: rancher/nginx-ingress-controller:nginx-1.6.4-hardened4
+    - name: rancher/rke2-cloud-provider:v1.26.3-build20230406
+    - name: rancher/mirrored-sig-storage-snapshot-controller:v6.2.1
+    - name: rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.1
+    - name: rancher/hardened-calico:v3.25.0-build20230209
+    - name: rancher/hardened-flannel:v0.21.3-build20230308
diff --git a/hauler/neuvector/rancher-airgap-neuvector.yaml b/hauler/neuvector/rancher-airgap-neuvector.yaml
@@ -14,8 +14,8 @@ metadata:
   name: rancher-airgap-images-neuvector
 spec:
   images:
-    - name: docker.io/neuvector/enforcer:5.3.0
-    - name: docker.io/neuvector/controller:5.3.0
-    - name: docker.io/neuvector/manager:5.3.0
-    - name: docker.io/neuvector/scanner:latest
-    - name: docker.io/neuvector/updater:latest
+    - name: neuvector/enforcer:5.3.0
+    - name: neuvector/controller:5.3.0
+    - name: neuvector/manager:5.3.0
+    - name: neuvector/scanner:latest
+    - name: neuvector/updater:latest
diff --git a/hauler/rancher/rancher-airgap-rancher-minimal.yaml b/hauler/rancher/rancher-airgap-rancher-minimal.yaml
@@ -28,10 +28,7 @@ metadata:
   name: rancher-airgap-images-rancher-minimal
 spec:
   images:
-    - name: quay.io/jetstack/cert-manager-cainjector:v1.14.2
-    - name: quay.io/jetstack/cert-manager-controller:v1.14.2
-    - name: quay.io/jetstack/cert-manager-webhook:v1.14.2
-    - name: quay.io/jetstack/cert-manager-startupapicheck:v1.14.2
+
     - name: rancher/backup-restore-operator:v4.0.0
     - name: rancher/calico-cni:v3.26.3-rancher1
     - name: rancher/cis-operator:v1.0.12

diff --git a/hauler/rancher/rancher-airgap-rancher.yaml b/hauler/rancher/rancher-airgap-rancher.yaml
@@ -28,10 +28,7 @@ metadata:
   name: rancher-airgap-images-rancher
 spec:
   images:
-    - name: quay.io/jetstack/cert-manager-cainjector:v1.14.2
-    - name: quay.io/jetstack/cert-manager-controller:v1.14.2
-    - name: quay.io/jetstack/cert-manager-webhook:v1.14.2
-    - name: quay.io/jetstack/cert-manager-startupapicheck:v1.14.2
+
     - name: rancher/aks-operator:v1.2.0
     - name: rancher/backup-restore-operator:v4.0.0
     - name: rancher/calico-cni:v3.26.3-rancher1