diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s index 09f0024..fbcfea6 100644 --- a/Jenkinsfile_k8s +++ b/Jenkinsfile_k8s @@ -34,9 +34,9 @@ parallel( }, 'updatecli': { withCredentials([string(credentialsId: 'updatecli-github-token', variable: 'UPDATECLI_GITHUB_TOKEN')]) { - updatecli(action: 'diff') + updatecli(action: 'diff', containerMemory: '1024Mi') if (env.BRANCH_NAME == 'main') { - updatecli(action: 'apply', cronTriggerExpression: '@weekly') + updatecli(action: 'apply', cronTriggerExpression: '@weekly', containerMemory: '1024Mi') } } }, diff --git a/README.md b/README.md index 91b00dc..e6db8c0 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you think that you should have access to this network, feel free to read [How To connect to this VPN, your VPN client must be configured with your [Jenkins account](https://accounts.jenkins.io/) and certificate authentication, requiring the following files: -* The CertificateAuthority **[`ca.crt`](https://github.com/jenkins-infra/openvpn/blob/main/cert/pki/ca.crt)** +* The CertificateAuthority **[`ca.crt`](https://github.com/jenkins-infra/docker-openvpn/blob/main/cert/pki/ca.crt)** * Your private key **`.key`** > ### your private key **must** remain **secret**! @@ -31,8 +31,8 @@ Then this certificate must be signed by an administrator who also assigns you a Feel free to follow the next action points: -* [Fork](https://help.github.com/articles/fork-a-repo/) this repository on your own Github account: [fork the repo](https://github.com/jenkins-infra/openvpn/fork) -* Clone your fork locally: `git clone https://github.com//openvpn && cd openvpn` +* [Fork](https://help.github.com/articles/fork-a-repo/) this repository on your own Github account: [fork the repo](https://github.com/jenkins-infra/docker-openvpn/fork) +* Clone your fork locally: `git clone https://github.com//docker-openvpn && cd docker-openvpn` * Build EASYVPN binary by running one of the following commands depending on your operating system: * `make init_osx` * `make init_linux` @@ -42,7 +42,7 @@ Feel free to follow the next action points: > ### This key **must** remain **secret**! -* Create a new Pull Request on [jenkinsinfra/openvpn](https://github.com/jenkins-infra/openvpn), `main` branch: [How to Create a pull request](https://help.github.com/articles/creating-a-pull-request/) +* Create a new Pull Request on [jenkinsinfra/docker-openvpn](https://github.com/jenkins-infra/docker-openvpn), `main` branch: [How to Create a pull request](https://help.github.com/articles/creating-a-pull-request/) * Open an INFRA ticket on [JIRA](https://issues.jenkins-ci.org) referencing your PR * Grab a cup of coffee and wait patiently for an administrator to sign your certificate request * Once an admin notifies you that everything is setup, you can [sync your fork](https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) then pull it to retrieve your certificate from `./cert/pki/issued/.crt` @@ -238,6 +238,6 @@ Please report any issue on the Jenkins infrastructure [project](https://issues.j * [How to contribute to OSS?](https://opensource.guide/how-to-contribute/) * [jenkins-infra/azure](https://github.com/jenkins-infra/azure) * [jenkins-infra/jenkins-infra](https://github.com/jenkins-infra/jenkins-infra/blob/production/dist/profile/manifests/openvpn.pp) -* [jenkins-infra/openvpn](https://github.com/jenkins-infra/openvpn) +* [jenkins-infra/docker-openvpn](https://github.com/jenkins-infra/docker-openvpn) * [mozilla/sops](https://github.com/mozilla/sops) * [openvpn/easy-rsa](https://github.com/OpenVPN/easy-rsa) diff --git a/utils/easyvpn/checks/main.go b/utils/easyvpn/checks/main.go index 2347fd4..129394b 100644 --- a/utils/easyvpn/checks/main.go +++ b/utils/easyvpn/checks/main.go @@ -1,13 +1,14 @@ package checks import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa" - "github.com/jenkins-infra/openvpn/utils/easyvpn/helpers" "errors" "fmt" "path" "sort" "strings" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers" ) // IsAllCertsSigned validate that every requested certificate are signed diff --git a/utils/easyvpn/cmd/check.go b/utils/easyvpn/cmd/check.go index 5237866..c6852c9 100644 --- a/utils/easyvpn/cmd/check.go +++ b/utils/easyvpn/cmd/check.go @@ -1,9 +1,10 @@ package cmd import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/checks" - "github.com/spf13/cobra" "os" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/checks" + "github.com/spf13/cobra" ) func init() { diff --git a/utils/easyvpn/cmd/config.go b/utils/easyvpn/cmd/config.go index 03a02a6..3374697 100644 --- a/utils/easyvpn/cmd/config.go +++ b/utils/easyvpn/cmd/config.go @@ -1,12 +1,13 @@ package cmd import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/git" - "github.com/jenkins-infra/openvpn/utils/easyvpn/network" "fmt" - "github.com/spf13/cobra" "os" "path" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network" + "github.com/spf13/cobra" ) var delete bool diff --git a/utils/easyvpn/cmd/request.go b/utils/easyvpn/cmd/request.go index 78c0f83..7c9f98b 100644 --- a/utils/easyvpn/cmd/request.go +++ b/utils/easyvpn/cmd/request.go @@ -1,11 +1,12 @@ package cmd import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa" - "github.com/jenkins-infra/openvpn/utils/easyvpn/git" "fmt" - "github.com/spf13/cobra" "path" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git" + "github.com/spf13/cobra" ) func init() { diff --git a/utils/easyvpn/cmd/revoke.go b/utils/easyvpn/cmd/revoke.go index 619696b..ca44b34 100644 --- a/utils/easyvpn/cmd/revoke.go +++ b/utils/easyvpn/cmd/revoke.go @@ -1,14 +1,15 @@ package cmd import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa" - "github.com/jenkins-infra/openvpn/utils/easyvpn/git" - "github.com/jenkins-infra/openvpn/utils/easyvpn/helpers" - "github.com/jenkins-infra/openvpn/utils/easyvpn/network" "fmt" - "github.com/spf13/cobra" "os" "path" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network" + "github.com/spf13/cobra" ) func init() { diff --git a/utils/easyvpn/cmd/sign.go b/utils/easyvpn/cmd/sign.go index a24f37d..c502729 100644 --- a/utils/easyvpn/cmd/sign.go +++ b/utils/easyvpn/cmd/sign.go @@ -1,14 +1,15 @@ package cmd import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/easyrsa" - "github.com/jenkins-infra/openvpn/utils/easyvpn/git" - "github.com/jenkins-infra/openvpn/utils/easyvpn/helpers" - "github.com/jenkins-infra/openvpn/utils/easyvpn/network" "fmt" - "github.com/spf13/cobra" "os" "path" + + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/easyrsa" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/git" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/helpers" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/network" + "github.com/spf13/cobra" ) var certDir string diff --git a/utils/easyvpn/git/main.go b/utils/easyvpn/git/main.go index b0efecb..46fccd2 100644 --- a/utils/easyvpn/git/main.go +++ b/utils/easyvpn/git/main.go @@ -92,7 +92,7 @@ func Push() { git(args...) if err == nil { - fmt.Printf("You can now open your Pull Request via \n\t https://github.com/jenkins-infra/openvpn/compare/%v...%v:%v\n", defaultBranch, owner, branch) + fmt.Printf("You can now open your Pull Request via \n\t https://github.com/jenkins-infra/docker-openvpn/compare/%v...%v:%v\n", defaultBranch, owner, branch) } } diff --git a/utils/easyvpn/go.mod b/utils/easyvpn/go.mod index aeaf2c0..1f59833 100644 --- a/utils/easyvpn/go.mod +++ b/utils/easyvpn/go.mod @@ -1,4 +1,4 @@ -module github.com/jenkins-infra/openvpn/utils/easyvpn +module github.com/jenkins-infra/docker-openvpn/utils/easyvpn go 1.17 diff --git a/utils/easyvpn/main.go b/utils/easyvpn/main.go index ffc2b74..f77d128 100644 --- a/utils/easyvpn/main.go +++ b/utils/easyvpn/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jenkins-infra/openvpn/utils/easyvpn/cmd" + "github.com/jenkins-infra/docker-openvpn/utils/easyvpn/cmd" ) func main() {