From 130d2de565877c1e856667266df9663a65affbab Mon Sep 17 00:00:00 2001 From: theguy951357 Date: Thu, 23 Feb 2023 16:07:24 -0500 Subject: [PATCH] update develop to 0.18.2 --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + README.md | 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 +- scripts/nm-quick.sh | 4 ++-- scripts/nm-upgrade.sh | 8 ++++---- swagger.yaml | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index bd066928..7fa6bdc3 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.2 - v0.18.1 - v0.18.0 - v0.17.1 diff --git a/README.md b/README.md index 2b514ce3..a39e7782 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/controllers/docs.go b/controllers/docs.go index 8511d25e..086e3553 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.18.1 +// Version: 0.18.2 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index c17b8ec0..197f12eb 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.1 + image: gravitl/netclient:v0.18.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 9ace4ec2..7e40c322 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.18.1 + image: gravitl/netclient:v0.18.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index a73ddb4d..16aff312 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -81,7 +81,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.18.1 + image: gravitl/netmaker:v0.18.2 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index cc541f6a..d182dc03 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.1 + image: gravitl/netmaker-ui:v0.18.2 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index 2a86bb29..53cf4712 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( stunserver "github.com/gravitl/netmaker/stun-server" ) -var version = "v0.18.1" +var version = "v0.18.2" // Start DB Connection and start API Request Handler func main() { diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 94edddea..e167c281 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -1,6 +1,6 @@ #!/bin/bash -LATEST="v0.18.1" +LATEST="v0.18.2" print_logo() {( cat << "EOF" @@ -40,7 +40,7 @@ usage () {( echo " \"branch\": - will install a specific branch using remote git and dockerhub " echo " -t tag of build; if buildtype=version, tag=version. If builtype=branch or builtype=local, tag=branch" echo "examples:" - echo " nm-quick.sh -e -b version -t v0.18.1" + echo " nm-quick.sh -e -b version -t v0.18.2" 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 6dc4a799..1ba4e183 100644 --- a/scripts/nm-upgrade.sh +++ b/scripts/nm-upgrade.sh @@ -187,7 +187,7 @@ collect_server_settings() { STUN_NAME="stun.$SERVER_NAME" echo "-----------------------------------------------------" - echo "Netmaker v0.18.1 requires a new DNS entry for $STUN_NAME." + echo "Netmaker v0.18.2 requires a new DNS entry for $STUN_NAME." echo "Please confirm this is added to your DNS provider before continuing" echo "(note: this is not required if using an nip.io address)" echo "-----------------------------------------------------" @@ -245,7 +245,7 @@ set_compose() { sed -i "s/v0.17.1/testing/g" /root/docker-compose.yml # RELEASE_REPLACE - Use this once release is ready - #sed -i "s/v0.17.1/v0.18.1/g" /root/docker-compose.yml + #sed -i "s/v0.17.1/v0.18.2/g" /root/docker-compose.yml yq ".services.netmaker.environment.SERVER_NAME = \"$SERVER_NAME\"" -i /root/docker-compose.yml yq ".services.netmaker.environment += {\"BROKER_NAME\": \"$BROKER_NAME\"}" -i /root/docker-compose.yml yq ".services.netmaker.environment += {\"STUN_NAME\": \"$STUN_NAME\"}" -i /root/docker-compose.yml @@ -416,7 +416,7 @@ join_networks() { # create an egress if necessary if [[ $HAS_EGRESS == "yes" ]]; then - echo "Egress is currently unimplemented. Wait for 0.18.1" + echo "Egress is currently unimplemented. Wait for 0.18.2" fi echo "HAS INGRESS: $HAS_INGRESS" @@ -447,7 +447,7 @@ join_networks() { cat << "EOF" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The Netmaker Upgrade Script: Upgrading to v0.18.1 so you don't have to! +The Netmaker Upgrade Script: Upgrading to v0.18.2 so you don't have to! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EOF diff --git a/swagger.yaml b/swagger.yaml index da270b7c..ec498572 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -710,7 +710,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.1 + version: 0.18.2 paths: /api/dns: get: