mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-06 01:07:41 +08:00
updating develop to v0.18.3
This commit is contained in:
1
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
@@ -31,6 +31,7 @@ body:
|
|||||||
label: Version
|
label: Version
|
||||||
description: What version are you running?
|
description: What version are you running?
|
||||||
options:
|
options:
|
||||||
|
- v0.18.3
|
||||||
- v0.18.2
|
- v0.18.2
|
||||||
- v0.18.1
|
- v0.18.1
|
||||||
- v0.18.0
|
- v0.18.0
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://github.com/gravitl/netmaker/releases">
|
<a href="https://github.com/gravitl/netmaker/releases">
|
||||||
<img src="https://img.shields.io/badge/Version-0.18.2-informational?style=flat-square" />
|
<img src="https://img.shields.io/badge/Version-0.18.3-informational?style=flat-square" />
|
||||||
</a>
|
</a>
|
||||||
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
|
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
|
||||||
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker?label=downloads" />
|
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker?label=downloads" />
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
//
|
//
|
||||||
// Schemes: https
|
// Schemes: https
|
||||||
// BasePath: /
|
// BasePath: /
|
||||||
// Version: 0.18.2
|
// Version: 0.18.3
|
||||||
// Host: netmaker.io
|
// Host: netmaker.io
|
||||||
//
|
//
|
||||||
// Consumes:
|
// Consumes:
|
||||||
|
@@ -16,7 +16,7 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: netclient
|
- name: netclient
|
||||||
image: gravitl/netclient:v0.18.2
|
image: gravitl/netclient:v0.18.3
|
||||||
env:
|
env:
|
||||||
- name: TOKEN
|
- name: TOKEN
|
||||||
value: "TOKEN_VALUE"
|
value: "TOKEN_VALUE"
|
||||||
|
@@ -28,7 +28,7 @@ spec:
|
|||||||
# - "<node label value>"
|
# - "<node label value>"
|
||||||
containers:
|
containers:
|
||||||
- name: netclient
|
- name: netclient
|
||||||
image: gravitl/netclient:v0.18.2
|
image: gravitl/netclient:v0.18.3
|
||||||
env:
|
env:
|
||||||
- name: TOKEN
|
- name: TOKEN
|
||||||
value: "TOKEN_VALUE"
|
value: "TOKEN_VALUE"
|
||||||
|
@@ -79,7 +79,7 @@ spec:
|
|||||||
value: "Kubernetes"
|
value: "Kubernetes"
|
||||||
- name: VERBOSITY
|
- name: VERBOSITY
|
||||||
value: "3"
|
value: "3"
|
||||||
image: gravitl/netmaker:v0.18.2
|
image: gravitl/netmaker:v0.18.3
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
name: netmaker
|
name: netmaker
|
||||||
ports:
|
ports:
|
||||||
|
@@ -15,7 +15,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: netmaker-ui
|
- name: netmaker-ui
|
||||||
image: gravitl/netmaker-ui:v0.18.2
|
image: gravitl/netmaker-ui:v0.18.3
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 443
|
- containerPort: 443
|
||||||
env:
|
env:
|
||||||
|
2
main.go
2
main.go
@@ -27,7 +27,7 @@ import (
|
|||||||
stunserver "github.com/gravitl/netmaker/stun-server"
|
stunserver "github.com/gravitl/netmaker/stun-server"
|
||||||
)
|
)
|
||||||
|
|
||||||
var version = "v0.18.2"
|
var version = "v0.18.3"
|
||||||
|
|
||||||
// Start DB Connection and start API Request Handler
|
// Start DB Connection and start API Request Handler
|
||||||
func main() {
|
func main() {
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
LATEST="v0.18.2"
|
LATEST="v0.18.3"
|
||||||
|
|
||||||
print_logo() {(
|
print_logo() {(
|
||||||
cat << "EOF"
|
cat << "EOF"
|
||||||
@@ -40,7 +40,7 @@ usage () {(
|
|||||||
echo " \"branch\": - will install a specific branch using remote git and dockerhub "
|
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 " -t tag of build; if buildtype=version, tag=version. If builtype=branch or builtype=local, tag=branch"
|
||||||
echo "examples:"
|
echo "examples:"
|
||||||
echo " nm-quick.sh -e -b version -t v0.18.2"
|
echo " nm-quick.sh -e -b version -t v0.18.3"
|
||||||
echo " nm-quick.sh -e -b local -t feature_v0.17.2_newfeature"
|
echo " nm-quick.sh -e -b local -t feature_v0.17.2_newfeature"
|
||||||
echo " nm-quick.sh -e -b branch -t develop"
|
echo " nm-quick.sh -e -b branch -t develop"
|
||||||
exit 1
|
exit 1
|
||||||
|
@@ -187,7 +187,7 @@ collect_server_settings() {
|
|||||||
|
|
||||||
STUN_NAME="stun.$SERVER_NAME"
|
STUN_NAME="stun.$SERVER_NAME"
|
||||||
echo "-----------------------------------------------------"
|
echo "-----------------------------------------------------"
|
||||||
echo "Netmaker v0.18.2 requires a new DNS entry for $STUN_NAME."
|
echo "Netmaker v0.18.3 requires a new DNS entry for $STUN_NAME."
|
||||||
echo "Please confirm this is added to your DNS provider before continuing"
|
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 "(note: this is not required if using an nip.io address)"
|
||||||
echo "-----------------------------------------------------"
|
echo "-----------------------------------------------------"
|
||||||
@@ -245,7 +245,7 @@ set_compose() {
|
|||||||
sed -i "s/v0.17.1/testing/g" /root/docker-compose.yml
|
sed -i "s/v0.17.1/testing/g" /root/docker-compose.yml
|
||||||
|
|
||||||
# RELEASE_REPLACE - Use this once release is ready
|
# RELEASE_REPLACE - Use this once release is ready
|
||||||
#sed -i "s/v0.17.1/v0.18.2/g" /root/docker-compose.yml
|
#sed -i "s/v0.17.1/v0.18.3/g" /root/docker-compose.yml
|
||||||
yq ".services.netmaker.environment.SERVER_NAME = \"$SERVER_NAME\"" -i /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 += {\"BROKER_NAME\": \"$BROKER_NAME\"}" -i /root/docker-compose.yml
|
||||||
yq ".services.netmaker.environment += {\"STUN_NAME\": \"$STUN_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
|
# create an egress if necessary
|
||||||
if [[ $HAS_EGRESS == "yes" ]]; then
|
if [[ $HAS_EGRESS == "yes" ]]; then
|
||||||
echo "Egress is currently unimplemented. Wait for 0.18.2"
|
echo "Egress is currently unimplemented. Wait for 0.18.3"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "HAS INGRESS: $HAS_INGRESS"
|
echo "HAS INGRESS: $HAS_INGRESS"
|
||||||
@@ -447,7 +447,7 @@ join_networks() {
|
|||||||
cat << "EOF"
|
cat << "EOF"
|
||||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
The Netmaker Upgrade Script: Upgrading to v0.18.2 so you don't have to!
|
The Netmaker Upgrade Script: Upgrading to v0.18.3 so you don't have to!
|
||||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
EOF
|
EOF
|
||||||
|
@@ -704,7 +704,7 @@ info:
|
|||||||
|
|
||||||
API calls must be authenticated via a header of the format -H “Authorization: Bearer <YOUR_SECRET_KEY>” 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/<network>/authenticate endpoint, as documented below.
|
API calls must be authenticated via a header of the format -H “Authorization: Bearer <YOUR_SECRET_KEY>” 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/<network>/authenticate endpoint, as documented below.
|
||||||
title: Netmaker
|
title: Netmaker
|
||||||
version: 0.18.2
|
version: 0.18.3
|
||||||
paths:
|
paths:
|
||||||
/api/dns:
|
/api/dns:
|
||||||
get:
|
get:
|
||||||
|
Reference in New Issue
Block a user