diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index ce2185dd..4b31af6b 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.5 - v0.18.4 - v0.18.3 - v0.18.2 diff --git a/README.md b/README.md index 72b07e21..9d6e8dc0 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 d661f5eb..d2bc36f4 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.4 + image: gravitl/netmaker:v0.18.5 restart: always volumes: - dnsconfig:/root/config/dnsconfig diff --git a/compose/docker-compose.netclient.yml b/compose/docker-compose.netclient.yml index 74d0a448..61e2cbef 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.4' + image: 'gravitl/netclient:v0.18.5' hostname: netmaker-1 network_mode: host restart: always diff --git a/controllers/docs.go b/controllers/docs.go index 20650220..95d437ee 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.18.4 +// Version: 0.18.5 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index cf49fd43..694b3499 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.4 + image: gravitl/netclient:v0.18.5 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 6de31abe..cb4abb1e 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.18.4 + image: gravitl/netclient:v0.18.5 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index c37409d6..3724234b 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.4 + image: gravitl/netmaker:v0.18.5 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index f16b15e5..8953aca0 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.4 + image: gravitl/netmaker-ui:v0.18.5 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index 217defe3..81dac51e 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( stunserver "github.com/gravitl/netmaker/stun-server" ) -var version = "v0.18.4" +var version = "v0.18.5" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index be5dd100..221199ef 100644 --- a/release.md +++ b/release.md @@ -1,4 +1,4 @@ -# Netmaker v0.18.4 +# Netmaker v0.18.5 ## **Wait till out of pre-release to fully upgrade** diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index dfe22ba2..59f057ad 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -1,6 +1,6 @@ #!/bin/bash -LATEST="v0.18.4" +LATEST="v0.18.5" 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.4" + echo " nm-quick.sh -e -b version -t v0.18.5" 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 bafa33b4..e30f015f 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.4/g" /root/docker-compose.yml + #sed -i "s/v0.17.1/v0.18.5/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 2a796fa9..8fe10824 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.4 + version: 0.18.5 paths: /api/dns: get: