Merge "Install flux into jump server"

diff --git a/demo/networkslice/free5gc/helm/README.md b/demo/networkslice/free5gc/helm/README.md
new file mode 100644 (file)
index 0000000..2e2e5c7
--- /dev/null
+++ b/demo/networkslice/free5gc/helm/README.md
@@ -0,0 +1,4 @@
+**Free5gc Helm Charts for Network Slicing Demo**
+
+This directory is deprecated. 
+The Helm Charts and deployment scripts for the network slicing demo is moved to: [https://github.com/akraino-edge-stack/icn-edge-5g](https://github.com/akraino-edge-stack/icn-edge-5g).

diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
index c56ed0f..0172dc7 100644 (file)
--- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml
+++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml
@@ -24,7 +24,7 @@ spec:
       - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
       - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
       - add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-      - apt update -y
+      - apt-get update -y
       - apt-get install -y ca-certificates
       - /usr/local/bin/install-container-runtime.sh
       - apt-get install -y kubelet={{ .Values.kubeVersion }} kubeadm={{ .Values.kubeVersion }} kubectl={{ .Values.kubeVersion }}

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index a17e95b..3342c73 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -36,7 +36,7 @@ spec:
     - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
     - add-apt-repository "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-    - apt update -y
+    - apt-get update -y
     - apt-get install -y ca-certificates
 {{- if .Values.keepalived }}
     - apt-get install -y keepalived

diff --git a/deploy/site/vm/e2etest/cdi-operator-release.yaml b/deploy/site/cluster-e2etest/cdi-operator-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/cdi-operator-release.yaml
rename to deploy/site/cluster-e2etest/cdi-operator-release.yaml

diff --git a/deploy/site/vm/e2etest/cdi-release.yaml b/deploy/site/cluster-e2etest/cdi-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/cdi-release.yaml
rename to deploy/site/cluster-e2etest/cdi-release.yaml

diff --git a/deploy/site/vm/e2etest/cpu-manager-release.yaml b/deploy/site/cluster-e2etest/cpu-manager-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/cpu-manager-release.yaml
rename to deploy/site/cluster-e2etest/cpu-manager-release.yaml

diff --git a/deploy/site/vm/e2etest/emco-db-release.yaml b/deploy/site/cluster-e2etest/emco-db-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-db-release.yaml
rename to deploy/site/cluster-e2etest/emco-db-release.yaml

diff --git a/deploy/site/vm/e2etest/emco-monitor-release.yaml b/deploy/site/cluster-e2etest/emco-monitor-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-monitor-release.yaml
rename to deploy/site/cluster-e2etest/emco-monitor-release.yaml

diff --git a/deploy/site/vm/e2etest/emco-namespace.yaml b/deploy/site/cluster-e2etest/emco-namespace.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-namespace.yaml
rename to deploy/site/cluster-e2etest/emco-namespace.yaml

diff --git a/deploy/site/vm/e2etest/emco-podsecurity-release.yaml b/deploy/site/cluster-e2etest/emco-podsecurity-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-podsecurity-release.yaml
rename to deploy/site/cluster-e2etest/emco-podsecurity-release.yaml

diff --git a/deploy/site/vm/e2etest/emco-services-release.yaml b/deploy/site/cluster-e2etest/emco-services-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-services-release.yaml
rename to deploy/site/cluster-e2etest/emco-services-release.yaml

diff --git a/deploy/site/vm/e2etest/emco-source.yaml b/deploy/site/cluster-e2etest/emco-source.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-source.yaml
rename to deploy/site/cluster-e2etest/emco-source.yaml

diff --git a/deploy/site/vm/e2etest/emco-tools-release.yaml b/deploy/site/cluster-e2etest/emco-tools-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/emco-tools-release.yaml
rename to deploy/site/cluster-e2etest/emco-tools-release.yaml

diff --git a/deploy/site/vm/e2etest/flux-system/gotk-components.yaml b/deploy/site/cluster-e2etest/flux-system/gotk-components.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/flux-system/gotk-components.yaml
rename to deploy/site/cluster-e2etest/flux-system/gotk-components.yaml

diff --git a/deploy/site/vm/e2etest/flux-system/gotk-sync.yaml b/deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml
similarity index 92%
rename from deploy/site/vm/e2etest/flux-system/gotk-sync.yaml
rename to deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml
index a3d94f3..12fef3a 100644 (file)
--- a/deploy/site/vm/e2etest/flux-system/gotk-sync.yaml
+++ b/deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml
@@ -19,7 +19,7 @@ metadata:
   namespace: flux-system
 spec:
   interval: 10m0s
-  path: ./deploy/site/vm/e2etest
+  path: ./deploy/site/cluster-e2etest
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/deploy/site/vm/e2etest/flux-system/kustomization.yaml b/deploy/site/cluster-e2etest/flux-system/kustomization.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/flux-system/kustomization.yaml
rename to deploy/site/cluster-e2etest/flux-system/kustomization.yaml

diff --git a/deploy/site/vm/e2etest/kata-kustomization.yaml b/deploy/site/cluster-e2etest/kata-kustomization.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kata-kustomization.yaml
rename to deploy/site/cluster-e2etest/kata-kustomization.yaml

diff --git a/deploy/site/vm/e2etest/kubevirt-operator-release.yaml b/deploy/site/cluster-e2etest/kubevirt-operator-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kubevirt-operator-release.yaml
rename to deploy/site/cluster-e2etest/kubevirt-operator-release.yaml

diff --git a/deploy/site/vm/e2etest/kubevirt-release.yaml b/deploy/site/cluster-e2etest/kubevirt-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kubevirt-release.yaml
rename to deploy/site/cluster-e2etest/kubevirt-release.yaml

diff --git a/deploy/site/vm/e2etest/kud-namespace.yaml b/deploy/site/cluster-e2etest/kud-namespace.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kud-namespace.yaml
rename to deploy/site/cluster-e2etest/kud-namespace.yaml

diff --git a/deploy/site/vm/e2etest/kud-podsecurity-release.yaml b/deploy/site/cluster-e2etest/kud-podsecurity-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kud-podsecurity-release.yaml
rename to deploy/site/cluster-e2etest/kud-podsecurity-release.yaml

diff --git a/deploy/site/vm/e2etest/kud-source.yaml b/deploy/site/cluster-e2etest/kud-source.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/kud-source.yaml
rename to deploy/site/cluster-e2etest/kud-source.yaml

diff --git a/deploy/site/vm/e2etest/multus-cni-release.yaml b/deploy/site/cluster-e2etest/multus-cni-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/multus-cni-release.yaml
rename to deploy/site/cluster-e2etest/multus-cni-release.yaml

diff --git a/deploy/site/vm/e2etest/node-feature-discovery-release.yaml b/deploy/site/cluster-e2etest/node-feature-discovery-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/node-feature-discovery-release.yaml
rename to deploy/site/cluster-e2etest/node-feature-discovery-release.yaml

diff --git a/deploy/site/vm/e2etest/ovn4nfv-network-release.yaml b/deploy/site/cluster-e2etest/ovn4nfv-network-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/ovn4nfv-network-release.yaml
rename to deploy/site/cluster-e2etest/ovn4nfv-network-release.yaml

diff --git a/deploy/site/vm/e2etest/ovn4nfv-release.yaml b/deploy/site/cluster-e2etest/ovn4nfv-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/ovn4nfv-release.yaml
rename to deploy/site/cluster-e2etest/ovn4nfv-release.yaml

diff --git a/deploy/site/vm/e2etest/qat-device-plugin-release.yaml b/deploy/site/cluster-e2etest/qat-device-plugin-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/qat-device-plugin-release.yaml
rename to deploy/site/cluster-e2etest/qat-device-plugin-release.yaml

diff --git a/deploy/site/vm/e2etest/sriov-network-operator-release.yaml b/deploy/site/cluster-e2etest/sriov-network-operator-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/sriov-network-operator-release.yaml
rename to deploy/site/cluster-e2etest/sriov-network-operator-release.yaml

diff --git a/deploy/site/vm/e2etest/sriov-network-release.yaml b/deploy/site/cluster-e2etest/sriov-network-release.yaml
similarity index 100%
rename from deploy/site/vm/e2etest/sriov-network-release.yaml
rename to deploy/site/cluster-e2etest/sriov-network-release.yaml

diff --git a/deploy/site/vm/cluster-e2etest-values.yaml b/deploy/site/vm/cluster-e2etest-values.yaml
index 9e399b0..e1060ba 100644 (file)
--- a/deploy/site/vm/cluster-e2etest-values.yaml
+++ b/deploy/site/vm/cluster-e2etest-values.yaml
@@ -12,4 +12,4 @@ networks:
 userData:
   sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrxu+fSrU51vgAO5zP5xWcTU8uLv4MkUZptE2m1BJE88JdQ80kz9DmUmq2AniMkVTy4pNeUW5PsmGJa+anN3MPM99CR9I37zRqy5i6rUDQgKjz8W12RauyeRMIBrbdy7AX1xasoTRnd6Ta47bP0egiFb+vUGnlTFhgfrbYfjbkJhVfVLCTgRw8Yj0NSK16YEyhYLbLXpix5udRpXSiFYIyAEWRCCsWJWljACr99P7EF82vCGI0UDGCCd/1upbUwZeTouD/FJBw9qppe6/1eaqRp7D36UYe3KzLpfHQNgm9AzwgYYZrD4tNN6QBMq/VUIuam0G1aLgG8IYRLs41HYkJ root@jump
 flux:
-  path: ./deploy/site/vm/e2etest
+  path: ./deploy/site/cluster-e2etest