diff --git a/on-premise/main/calico_v3.28.2/custom-resources.yaml b/on-premise/main/calico_v3.28.2/custom-resources.yaml index 2407f97..32d9552 100644 --- a/on-premise/main/calico_v3.28.2/custom-resources.yaml +++ b/on-premise/main/calico_v3.28.2/custom-resources.yaml @@ -10,7 +10,7 @@ spec: ipPools: - name: default-ipv4-ippool blockSize: 26 - cidr: 10.1.0.0/16 + cidr: 10.10.0.0/16 encapsulation: VXLANCrossSubnet natOutgoing: Enabled nodeSelector: all() diff --git a/on-premise/main/rancher_v2.9.1/rancher/rancher-2.9.1.tgz b/on-premise/main/rancher_v2.9.1/rancher/rancher-2.9.1.tgz index a0aab75..8da00e5 100644 Binary files a/on-premise/main/rancher_v2.9.1/rancher/rancher-2.9.1.tgz and b/on-premise/main/rancher_v2.9.1/rancher/rancher-2.9.1.tgz differ diff --git a/on-premise/main/rancher_v2.9.1/rancher/values.yaml b/on-premise/main/rancher_v2.9.1/rancher/values.yaml index 0867a82..93bbac8 100644 --- a/on-premise/main/rancher_v2.9.1/rancher/values.yaml +++ b/on-premise/main/rancher_v2.9.1/rancher/values.yaml @@ -133,7 +133,7 @@ resources: {} # - external tls: external # by ljh -systemDefaultRegistry: "" +systemDefaultRegistry: "reg.inje-private.com/nnd002" # Set to use the packaged system charts useBundledSystemChart: false @@ -161,7 +161,7 @@ customLogos: postDelete: enabled: false #by ljh image: - repository: reg.inje-private.com/nnd002/rancher/shell # by ljh add registry + repository: rancher/shell # by ljh add registry tag: v0.2.1 namespaceList: - cattle-fleet-system