From 84eca8682ff2efd1e5a5446a386c4f1db9fb9330 Mon Sep 17 00:00:00 2001 From: theguy951357 Date: Thu, 16 Mar 2023 22:09:57 -0400 Subject: [PATCH] upgrade to 0.18.4 --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + README.md | 2 +- compose/docker-compose-emqx.yml | 4 ++-- compose/docker-compose.netclient.yml | 2 +- controllers/docs.go | 2 +- k8s/client/netclient-daemonset.yaml | 2 +- k8s/client/netclient.yaml | 2 +- k8s/server/netmaker-server.yaml | 2 +- k8s/server/netmaker-ui.yaml | 2 +- main.go | 2 +- release.md | 2 +- scripts/nm-quick.sh | 4 ++-- scripts/nm-upgrade.sh | 2 +- swagger.yaml | 2 +- 14 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 09f822b7..ce2185dd 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,6 +31,7 @@ body: label: Version description: What version are you running? options: + - v0.18.4 - v0.18.3 - v0.18.2 - v0.18.1 diff --git a/README.md b/README.md index 698e7a33..72b07e21 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/compose/docker-compose-emqx.yml b/compose/docker-compose-emqx.yml index fe892205..d661f5eb 100644 --- a/compose/docker-compose-emqx.yml +++ b/compose/docker-compose-emqx.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.18.2 + image: gravitl/netmaker:v0.18.4 restart: always volumes: - dnsconfig:/root/config/dnsconfig @@ -35,7 +35,7 @@ services: - "3478:3478/udp" netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.18.2 + image: gravitl/netmaker-ui:v0.18.4 depends_on: - netmaker links: diff --git a/compose/docker-compose.netclient.yml b/compose/docker-compose.netclient.yml index 0c895af8..74d0a448 100644 --- a/compose/docker-compose.netclient.yml +++ b/compose/docker-compose.netclient.yml @@ -3,7 +3,7 @@ version: "3.4" services: netclient: container_name: netclient - image: 'gravitl/netclient:v0.18.3' + image: 'gravitl/netclient:v0.18.4' hostname: netmaker-1 network_mode: host restart: always diff --git a/controllers/docs.go b/controllers/docs.go index 36c02949..20650220 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.18.3 +// Version: 0.18.4 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index d446899b..cf49fd43 100644 --- a/k8s/client/netclient-daemonset.yaml +++ b/k8s/client/netclient-daemonset.yaml @@ -16,7 +16,7 @@ spec: hostNetwork: true containers: - name: netclient - image: gravitl/netclient:v0.18.3 + image: gravitl/netclient:v0.18.4 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 7b656282..6de31abe 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.18.3 + image: gravitl/netclient:v0.18.4 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index e759c2a5..c37409d6 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -79,7 +79,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.18.3 + image: gravitl/netmaker:v0.18.4 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index aada149b..f16b15e5 100644 --- a/k8s/server/netmaker-ui.yaml +++ b/k8s/server/netmaker-ui.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: netmaker-ui - image: gravitl/netmaker-ui:v0.18.3 + image: gravitl/netmaker-ui:v0.18.4 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index d748ce0a..217defe3 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( stunserver "github.com/gravitl/netmaker/stun-server" ) -var version = "v0.18.3" +var version = "v0.18.4" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index 864a32ac..e240c3b7 100644 --- a/release.md +++ b/release.md @@ -1,4 +1,4 @@ -# Netmaker v0.18.3 +# Netmaker v0.18.4 ## **Wait till out of pre-release to fully upgrade** diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index d48b93d4..dfe22ba2 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -1,6 +1,6 @@ #!/bin/bash -LATEST="v0.18.3" +LATEST="v0.18.4" print_logo() {( cat << "EOF" @@ -43,7 +43,7 @@ usage () { echo " -t tag of build; if buildtype=version, tag=version. If builtype=branch or builtype=local, tag=branch" echo " -a auto-build; skip prompts and use defaults, if none provided" echo "examples:" - echo " nm-quick.sh -e -b version -t v0.18.3" + echo " nm-quick.sh -e -b version -t v0.18.4" echo " nm-quick.sh -e -b local -t feature_v0.17.2_newfeature" echo " nm-quick.sh -e -b branch -t develop" exit 1 diff --git a/scripts/nm-upgrade.sh b/scripts/nm-upgrade.sh index 5123a013..bafa33b4 100644 --- a/scripts/nm-upgrade.sh +++ b/scripts/nm-upgrade.sh @@ -357,7 +357,7 @@ set_compose() { STUN_PORT=3478 # RELEASE_REPLACE - Use this once release is ready - #sed -i "s/v0.17.1/v0.18.3/g" /root/docker-compose.yml + #sed -i "s/v0.17.1/v0.18.4/g" /root/docker-compose.yml yq ".services.netmaker.environment.SERVER_NAME = \"$SERVER_NAME\"" -i /root/docker-compose.yml yq ".services.netmaker.environment += {\"BROKER_ENDPOINT\": \"wss://$BROKER_NAME\"}" -i /root/docker-compose.yml yq ".services.netmaker.environment += {\"SERVER_BROKER_ENDPOINT\": \"ws://mq:1883\"}" -i /root/docker-compose.yml diff --git a/swagger.yaml b/swagger.yaml index b2630ab7..2a796fa9 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -704,7 +704,7 @@ info: API calls must be authenticated via a header of the format -H “Authorization: Bearer ” There are two methods to obtain YOUR_SECRET_KEY: 1. Using the masterkey. By default, this value is “secret key,” but you should change this on your instance and keep it secure. This value can be set via env var at startup or in a config file (config/environments/< env >.yaml). See the [Netmaker](https://docs.netmaker.org/index.html) documentation for more details. 2. Using a JWT received for a node. This can be retrieved by calling the /api/nodes//authenticate endpoint, as documented below. title: Netmaker - version: 0.18.3 + version: 0.18.4 paths: /api/dns: get: