Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ripping out netmaker.conf #415

Merged
merged 1 commit into from
May 30, 2023
Merged

ripping out netmaker.conf #415

merged 1 commit into from
May 30, 2023

Conversation

afeiszli
Copy link
Contributor

@afeiszli afeiszli commented May 23, 2023 •
edited
Loading

Describe your changes

netmaker.conf file was leading to test cases failing. It would go missing somehow and if it is gone, peer updates break. Started by removing the returns for any function that processed netmaker.conf, but determined it would be better to just remove it entirely. We do not use this file, so keeping it in could only be dangerous, and led to increased code complexity.

Look at ticket for details about issue this caused.

Provide Issue ticket number if applicable/not in title

Provide link to Netmaker PR if required

Provide testing steps

Basic test is sufficient. Check to see if it runs normally. Confirm there is no netmaker.conf file in /etc/netclient if it's a new install. If test goes on top of an existing client, remove /etc/netclient/netmaker.conf and confirm it continues to work and receive peer updates.

Checklist before requesting a review

  • My changes affect only 10 files or less.
  • I have performed a self-review of my code and tested it.
  • If it is a new feature, I have added thorough tests, my code is <= 1450 lines.
  • If it is a bugfix, my code is <= 200 lines.
  • My functions are <= 80 lines.
  • I have had my code reviewed by a peer.
  • My unit tests pass locally.
  • Netclient & Netmaker are awesome.

mattkasun
mattkasun suggested changes May 23, 2023
View reviewed changes
functions/mqhandlers.go Show resolved Hide resolved
@afeiszli afeiszli requested a review from mattkasun May 23, 2023 21:57
@abhishek9686 abhishek9686 merged commit 762ec55 into develop May 30, 2023
afeiszli added a commit that referenced this pull request Jun 1, 2023
@github-actions @dependabot
@mattkasun @afeiszli @abhishek9686 @Aceix
v0.20.1 (#429)
ca49f99 
* Bump golang.org/x/term from 0.7.0 to 0.8.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.7.0 to 0.8.0.
- [Commits](golang/term@v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* workflow refactor

* limit gui builds

* txeh updates

* Bump github.com/guumaster/hostctl from 1.1.3 to 1.1.4

Bumps [github.com/guumaster/hostctl](https://github.com/guumaster/hostctl) from 1.1.3 to 1.1.4.
- [Release notes](https://github.com/guumaster/hostctl/releases)
- [Changelog](https://github.com/guumaster/hostctl/blob/master/.goreleaser.yml)
- [Commits](guumaster/hostctl@v1.1.3...v1.1.4)

---
updated-dependencies:
- dependency-name: github.com/guumaster/hostctl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump golang.org/x/net from 0.9.0 to 0.10.0 (#402)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.9.0 to 0.10.0.
- [Commits](golang/net@v0.9.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fixed data endcoding (#400)

* fixed data endcoding

* remove redundant casting

* Bump golang.org/x/crypto from 0.8.0 to 0.9.0 (#403)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.8.0 to 0.9.0.
- [Commits](golang/crypto@v0.8.0...v0.9.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* NET-89:  TURN reactive Implementation (#398)

* initialize turn client always, irrespective of nat type

* run background thread to resolve peer connection using turn

* update go mod

* add read lock for turncfg

* use conn negotitation action at required locations

* use lasthandshake for connection status

* use a separate wait group for proxy threads

* comments fix

* typo fix

* add additional logging for errors

* update go mod

* update action var name

* update go mod

* use relevant func name

* pr comments

* Bump github.com/wailsapp/wails/v2 from 2.2.0 to 2.5.0 (#404)

Bumps [github.com/wailsapp/wails/v2](https://github.com/wailsapp/wails) from 2.2.0 to 2.5.0.
- [Release notes](https://github.com/wailsapp/wails/releases)
- [Commits](wailsapp/wails@v2.2.0...v2.5.0)

---
updated-dependencies:
- dependency-name: github.com/wailsapp/wails/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump alpine from 3.17.3 to 3.18.0 (#401)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update versions (#406)

* Bump github.com/wailsapp/wails/v2 from 2.5.0 to 2.5.1 (#414)

Bumps [github.com/wailsapp/wails/v2](https://github.com/wailsapp/wails) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/wailsapp/wails/releases)
- [Commits](wailsapp/wails@v2.5.0...v2.5.1)

---
updated-dependencies:
- dependency-name: github.com/wailsapp/wails/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* discord message after branch test run (#419)

* discord message after branch test run

* add repo to discord message

* ripping out netmaker.conf (#415)

* add ip6tabels support to docker netclient (#421)

* prevent updates to host params that should not be changed (#417)

* NET-10: Refactor Peer update Phase-1 (#407)

* singleton peer update mq handler

* process adding and removing single peer

* avoid restarting daemon on join to network host update

* handle peer list on singleton update

* support multiple peer removal

* use map for peer data

* init peer map

* don't retrun if wg file update fails

* add debug comment

* add debug comment

* add func comments

* add comment

* rm ununsed funcs

* prevent server overwriting immutable host parameters

* Revert "NET-10: Refactor Peer update Phase-1 (#407)"

This reverts commit 627b924.

---------

Co-authored-by: Abhishek K <[email protected]>

* NET-186: hole punch wg port, start proxy on free port available (#420)

* report wg public listen port

* save the proxy port

* debug log

* checkin with servers on broker connection

* start proxy on freeport

* revert proxy autoswitch removal

* use natinfo for proxy port

* pr comments

* Net 202  (#422)

* join endpoint

* sso endpoint for gui

* review comments

* sso registration with gui (#389)

* Revert "fix(GRA-1387): remove join by sso/basic auth"

This reverts commit ec8630d.

* feat(NET-20): add join by basic auth for nc-gui

* fix(NET-20): wip - join by oauth/basic auth

* join endpoint

* sso endpoint for gui

* review comments

* fix(NET-20): wip - join by oauth/basic auth

* fix(NET-20):  join by oauth/basic auth

* Revert "join endpoint"

This reverts commit 5f2351f.

* fix(NET-20): only join via enrollment key option

---------

Co-authored-by: Matthew R Kasun <[email protected]>

* version and release note updates (#423)

* Net 12 (#427)

* discord message after branch test run

* add repo to discord message

* .goreleaser update

* update go mod for release

* Update go.mod

* fix go mod

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew R Kasun <[email protected]>
Co-authored-by: Alex Feiszli <[email protected]>
Co-authored-by: Abhishek K <[email protected]>
Co-authored-by: Aceix <[email protected]>
Co-authored-by: Gravitl <[email protected]>
afeiszli added a commit that referenced this pull request Jun 7, 2023
@github-actions @dependabot
@mattkasun @afeiszli @abhishek9686 @Aceix
v0.20.1 (#443)
1a6cefd 
* Bump golang.org/x/term from 0.7.0 to 0.8.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.7.0 to 0.8.0.
- [Commits](golang/term@v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* workflow refactor

* limit gui builds

* txeh updates

* Bump github.com/guumaster/hostctl from 1.1.3 to 1.1.4

Bumps [github.com/guumaster/hostctl](https://github.com/guumaster/hostctl) from 1.1.3 to 1.1.4.
- [Release notes](https://github.com/guumaster/hostctl/releases)
- [Changelog](https://github.com/guumaster/hostctl/blob/master/.goreleaser.yml)
- [Commits](guumaster/hostctl@v1.1.3...v1.1.4)

---
updated-dependencies:
- dependency-name: github.com/guumaster/hostctl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump golang.org/x/net from 0.9.0 to 0.10.0 (#402)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.9.0 to 0.10.0.
- [Commits](golang/net@v0.9.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fixed data endcoding (#400)

* fixed data endcoding

* remove redundant casting

* Bump golang.org/x/crypto from 0.8.0 to 0.9.0 (#403)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.8.0 to 0.9.0.
- [Commits](golang/crypto@v0.8.0...v0.9.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* NET-89:  TURN reactive Implementation (#398)

* initialize turn client always, irrespective of nat type

* run background thread to resolve peer connection using turn

* update go mod

* add read lock for turncfg

* use conn negotitation action at required locations

* use lasthandshake for connection status

* use a separate wait group for proxy threads

* comments fix

* typo fix

* add additional logging for errors

* update go mod

* update action var name

* update go mod

* use relevant func name

* pr comments

* Bump github.com/wailsapp/wails/v2 from 2.2.0 to 2.5.0 (#404)

Bumps [github.com/wailsapp/wails/v2](https://github.com/wailsapp/wails) from 2.2.0 to 2.5.0.
- [Release notes](https://github.com/wailsapp/wails/releases)
- [Commits](wailsapp/wails@v2.2.0...v2.5.0)

---
updated-dependencies:
- dependency-name: github.com/wailsapp/wails/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump alpine from 3.17.3 to 3.18.0 (#401)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update versions (#406)

* Bump github.com/wailsapp/wails/v2 from 2.5.0 to 2.5.1 (#414)

Bumps [github.com/wailsapp/wails/v2](https://github.com/wailsapp/wails) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/wailsapp/wails/releases)
- [Commits](wailsapp/wails@v2.5.0...v2.5.1)

---
updated-dependencies:
- dependency-name: github.com/wailsapp/wails/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* discord message after branch test run (#419)

* discord message after branch test run

* add repo to discord message

* ripping out netmaker.conf (#415)

* add ip6tabels support to docker netclient (#421)

* prevent updates to host params that should not be changed (#417)

* NET-10: Refactor Peer update Phase-1 (#407)

* singleton peer update mq handler

* process adding and removing single peer

* avoid restarting daemon on join to network host update

* handle peer list on singleton update

* support multiple peer removal

* use map for peer data

* init peer map

* don't retrun if wg file update fails

* add debug comment

* add debug comment

* add func comments

* add comment

* rm ununsed funcs

* prevent server overwriting immutable host parameters

* Revert "NET-10: Refactor Peer update Phase-1 (#407)"

This reverts commit 627b924.

---------

Co-authored-by: Abhishek K <[email protected]>

* NET-186: hole punch wg port, start proxy on free port available (#420)

* report wg public listen port

* save the proxy port

* debug log

* checkin with servers on broker connection

* start proxy on freeport

* revert proxy autoswitch removal

* use natinfo for proxy port

* pr comments

* Net 202  (#422)

* join endpoint

* sso endpoint for gui

* review comments

* sso registration with gui (#389)

* Revert "fix(GRA-1387): remove join by sso/basic auth"

This reverts commit ec8630d.

* feat(NET-20): add join by basic auth for nc-gui

* fix(NET-20): wip - join by oauth/basic auth

* join endpoint

* sso endpoint for gui

* review comments

* fix(NET-20): wip - join by oauth/basic auth

* fix(NET-20):  join by oauth/basic auth

* Revert "join endpoint"

This reverts commit 5f2351f.

* fix(NET-20): only join via enrollment key option

---------

Co-authored-by: Matthew R Kasun <[email protected]>

* version and release note updates (#423)

* Net 12 (#427)

* discord message after branch test run

* add repo to discord message

* .goreleaser update

* NET-185 Dont re-use the Config struct (#432)

* - dont re-use the Config struct- gitignore for idea

* test for yaml config merging

* NET-287: get host public IP using stun (#431)

* get host public IP using stun

* check if ip is not specified

* check if ip is not specified

* update go mod for release

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew R Kasun <[email protected]>
Co-authored-by: Alex Feiszli <[email protected]>
Co-authored-by: Abhishek K <[email protected]>
Co-authored-by: Aceix <[email protected]>
Co-authored-by: Tobias Cudnik <[email protected]>
Co-authored-by: Gravitl <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattkasun mattkasun mattkasun approved these changes

@abhishek9686 abhishek9686 abhishek9686 approved these changes

@theguy951357 theguy951357 theguy951357 approved these changes

@Aceix Aceix Aceix approved these changes

@TobiaszCudnik TobiaszCudnik Awaiting requested review from TobiaszCudnik

@gabrielseibel1 gabrielseibel1 Awaiting requested review from gabrielseibel1

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@afeiszli @Aceix @theguy951357 @abhishek9686 @mattkasun