From 844ebb7838dc2c4419550bbc68e323a615d47bfc Mon Sep 17 00:00:00 2001
From: Samuel Liu <liupeng0518@gmail.com>
Date: Tue, 13 Apr 2021 15:46:50 +0800
Subject: [PATCH] fix offline mode (#7493)
* fix offline mode
* add offline messages
---
docs/offline-environment.md | 2 +-
.../sample/group_vars/{k8s-cluster => all}/offline.yml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
rename inventory/sample/group_vars/{k8s-cluster => all}/offline.yml (83%)
diff --git a/docs/offline-environment.md b/docs/offline-environment.md
index 21689eedb..f8fc5dc88 100644
--- a/docs/offline-environment.md
+++ b/docs/offline-environment.md
@@ -10,7 +10,7 @@ In case your servers don't have access to internet (for example when deploying o
## Configure Inventory
-Once all artifacts are accessible from your internal network, **adjust** the following variables in [your inventory](/inventory/sample/group_vars/k8s-cluster/offline.yml) to match your environment:
+Once all artifacts are accessible from your internal network, **adjust** the following variables in [your inventory](/inventory/sample/group_vars/all/offline.yml) to match your environment:
```yaml
# Registry overrides
diff --git a/inventory/sample/group_vars/k8s-cluster/offline.yml b/inventory/sample/group_vars/all/offline.yml
similarity index 83%
rename from inventory/sample/group_vars/k8s-cluster/offline.yml
rename to inventory/sample/group_vars/all/offline.yml
index e307211f6..7078fd292 100644
--- a/inventory/sample/group_vars/k8s-cluster/offline.yml
+++ b/inventory/sample/group_vars/all/offline.yml
@@ -35,6 +35,15 @@
# [Optional] Calico with kdd: If using Calico network plugin with kdd datastore
# calico_crds_download_url: "{{ files_repo }}/kubernetes/calico/{{ calico_version }}.tar.gz"
+# [Optional] helm: only if you set helm_enabled: true
+helm_download_url: "{{ files_repo }}/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz"
+
+# [Optional] crun: only if you set crun_enabled: true
+crun_download_url: "{{ files_repo }}/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}"
+
+# [Optional] kata: only if you set kata_containers_enabled: true
+kata_containers_download_url: "{{ files_repo }}/kata-containers/runtime/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz"
+
## CentOS/Redhat
### For EL7, base and extras repo must be available, for EL8, baseos and appstream
### By default we enable those repo automatically
--
GitLab