projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set K8s 1.26 in charmed OSM installation
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
4cee0a3
..
bdacf30
100755
(executable)
--- a/
installers/charmed_install.sh
+++ b/
installers/charmed_install.sh
@@
-20,8
+20,8
@@
JUJU_VERSION=2.9
JUJU_AGENT_VERSION=2.9.29
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
JUJU_AGENT_VERSION=2.9.29
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.2
3
-OSMCLIENT_VERSION=
latest
+MICROK8S_VERSION=1.2
6
+OSMCLIENT_VERSION=
12.0
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
PATH=/snap/bin:${PATH}
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
PATH=/snap/bin:${PATH}
@@
-41,7
+41,7
@@
MODEL_NAME=osm
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=
latest/edg
e
+CHARMHUB_CHANNEL=
12.0/stabl
e
unset TAG
function check_arguments(){
unset TAG
function check_arguments(){
@@
-133,7
+133,7
@@
EOF
else
sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
sg ${KUBEGRP} -c "microk8s.enable ingress"
else
sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
sg ${KUBEGRP} -c "microk8s.enable ingress"
- sg ${KUBEGRP} -c "microk8s.enable storage dns"
+ sg ${KUBEGRP} -c "microk8s.enable
hostpath-
storage dns"
TIME_TO_WAIT=30
start_time="$(date -u +%s)"
while true
TIME_TO_WAIT=30
start_time="$(date -u +%s)"
while true