Skip to content

Commit 9e74334

Browse files
authored
Merge pull request #3646 from gravitl/release-v1.1.0
v1.1.0
2 parents 20b1b6c + 0932049 commit 9e74334

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3251
-1739
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ body:
3131
label: Version
3232
description: What version are you running?
3333
options:
34+
- v1.1.0
3435
- v1.0.0
3536
- v0.99.0
3637
- v0.90.0

.github/workflows/branchtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
echo "NETCLIENT_BRANCH=develop" >> $GITHUB_ENV
4242
fi
4343
- name: Checkout netclient repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545
with:
4646
repository: gravitl/netclient
4747
fetch-depth: 0

.github/workflows/docker-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
- name: SetUp Buildx
1717
uses: docker/setup-buildx-action@v3
1818
- name: Login to Dockerhub

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
with:
1818
repository: gravitl/netmaker
1919
ref: ${{ github.event.inputs.branch || 'master' }}

.github/workflows/publish-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "TAG=${TAG}" >> $GITHUB_ENV
3030
-
3131
name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
-
3434
name: Set up QEMU
3535
uses: docker/setup-qemu-action@v3
@@ -69,7 +69,7 @@ jobs:
6969
echo "TAG=${TAG}" >> $GITHUB_ENV
7070
-
7171
name: Checkout
72-
uses: actions/checkout@v4
72+
uses: actions/checkout@v5
7373
-
7474
name: Set up QEMU
7575
uses: docker/setup-qemu-action@v3

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
- name: Setup go
3030
uses: actions/setup-go@v5
3131
with:
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-22.04
4343
steps:
4444
- name: Checkout
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646
- name: Setup Go
4747
uses: actions/setup-go@v5
4848
with:
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-22.04
6363
steps:
6464
- name: Checkout
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
- name: Setup Go
6767
uses: actions/setup-go@v5
6868
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY . .
66

77
RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -w " -tags ${tags} .
88
# RUN go build -tags=ee . -o netmaker main.go
9-
FROM alpine:3.22.0
9+
FROM alpine:3.22.1
1010

1111
# add a c lib
1212
# set the working directory

Dockerfile-quick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#first stage - builder
2-
FROM alpine:3.22.0
2+
FROM alpine:3.22.1
33
ARG version
44
WORKDIR /app
55
COPY ./netmaker /root/netmaker

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<p align="center">
1818
<a href="https://github.com/gravitl/netmaker/releases">
19-
<img src="https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square" />
19+
<img src="https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square" />
2020
</a>
2121
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
2222
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker?label=downloads" />

auth/auth.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ package auth
33
import (
44
"github.com/gravitl/netmaker/logic"
55
"github.com/gravitl/netmaker/models"
6-
"golang.org/x/oauth2"
76
)
87

98
// == consts ==
109
const (
1110
node_signin_length = 64
1211
)
1312

14-
var (
15-
auth_provider *oauth2.Config
16-
)
17-
1813
func isUserIsAllowed(username, network string) (*models.User, error) {
1914

2015
user, err := logic.GetUser(username)

0 commit comments

Comments
 (0)