diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 036c4b7..a8d77a0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Lint golang code @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Run tests @@ -34,7 +34,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Build binary diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 7148520..09c07fb 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Lint golang code @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Run tests @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.22 + go-version: 1.19 - name: Check out code uses: actions/checkout@v2 - name: Build binary diff --git a/Dockerfile b/Dockerfile index 32c445e..c3342a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22 as builder +FROM golang:1.19 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/README.md b/README.md index e9f42d9..d6554b0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Expose your service in Kubernetes to the Internet with open source FRP! -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square) [![made with Go](https://img.shields.io/badge/made%20with-Go-brightgreen)](http://golang.org) [![Github main branch build](https://img.shields.io/github/workflow/status/zufardhiyaulhaq/frp-operator/Main)](https://github.com/zufardhiyaulhaq/frp-operator/actions/workflows/main.yml) [![GitHub issues](https://img.shields.io/github/issues/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/pulls)[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/frp-operator)](https://artifacthub.io/packages/search?repo=frp-operator) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square) [![made with Go](https://img.shields.io/badge/made%20with-Go-brightgreen)](http://golang.org) [![Github main branch build](https://img.shields.io/github/workflow/status/zufardhiyaulhaq/frp-operator/Main)](https://github.com/zufardhiyaulhaq/frp-operator/actions/workflows/main.yml) [![GitHub issues](https://img.shields.io/github/issues/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/pulls)[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/frp-operator)](https://artifacthub.io/packages/search?repo=frp-operator) ## Document 1. [RFC: Fast Reverse Proxy Operator](https://docs.google.com/document/d/18_X4KKLNMAFcfYP-Nh0wwU31RP903IrLuc1Uemxcpoo) @@ -65,7 +65,7 @@ http://178.128.100.87:8080/ |-----|------|---------|-------------| | operator.image | string | `"zufardhiyaulhaq/frp-operator"` | | | operator.replica | int | `1` | | -| operator.tag | string | `"v0.3.0"` | | +| operator.tag | string | `"v0.3.1"` | | | resources.limits.cpu | string | `"200m"` | | | resources.limits.memory | string | `"100Mi"` | | | resources.requests.cpu | string | `"100m"` | | diff --git a/charts/frp-operator/README.md b/charts/frp-operator/README.md index cfc2e74..d6554b0 100644 --- a/charts/frp-operator/README.md +++ b/charts/frp-operator/README.md @@ -2,7 +2,7 @@ Expose your service in Kubernetes to the Internet with open source FRP! -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square) [![made with Go](https://img.shields.io/badge/made%20with-Go-brightgreen)](http://golang.org) [![Github main branch build](https://img.shields.io/github/workflow/status/zufardhiyaulhaq/frp-operator/Main)](https://github.com/zufardhiyaulhaq/frp-operator/actions/workflows/main.yml) [![GitHub issues](https://img.shields.io/github/issues/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/pulls)[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/frp-operator)](https://artifacthub.io/packages/search?repo=frp-operator) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square) [![made with Go](https://img.shields.io/badge/made%20with-Go-brightgreen)](http://golang.org) [![Github main branch build](https://img.shields.io/github/workflow/status/zufardhiyaulhaq/frp-operator/Main)](https://github.com/zufardhiyaulhaq/frp-operator/actions/workflows/main.yml) [![GitHub issues](https://img.shields.io/github/issues/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/zufardhiyaulhaq/frp-operator)](https://github.com/zufardhiyaulhaq/frp-operator/pulls)[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/frp-operator)](https://artifacthub.io/packages/search?repo=frp-operator) ## Document 1. [RFC: Fast Reverse Proxy Operator](https://docs.google.com/document/d/18_X4KKLNMAFcfYP-Nh0wwU31RP903IrLuc1Uemxcpoo) @@ -35,6 +35,8 @@ token = yourtoken frps -c ./frps.ini ``` +You can reuse our build-in ansible playbook to setup the FRP server on your machine, please check https://github.com/zufardhiyaulhaq/frp-operator/tree/main/ansible/server + ## Usage 1. Apply some example ```console @@ -63,7 +65,7 @@ http://178.128.100.87:8080/ |-----|------|---------|-------------| | operator.image | string | `"zufardhiyaulhaq/frp-operator"` | | | operator.replica | int | `1` | | -| operator.tag | string | `"v0.3.0"` | | +| operator.tag | string | `"v0.3.1"` | | | resources.limits.cpu | string | `"200m"` | | | resources.limits.memory | string | `"100Mi"` | | | resources.requests.cpu | string | `"100m"` | | diff --git a/charts/releases/frp-operator-1.2.0.tgz b/charts/releases/frp-operator-1.2.0.tgz new file mode 100644 index 0000000..13f1f67 Binary files /dev/null and b/charts/releases/frp-operator-1.2.0.tgz differ diff --git a/charts/releases/index.yaml b/charts/releases/index.yaml index 9da9f3b..8b6cf56 100644 --- a/charts/releases/index.yaml +++ b/charts/releases/index.yaml @@ -1,9 +1,25 @@ apiVersion: v1 entries: frp-operator: + - apiVersion: v2 + appVersion: 0.3.1 + created: "2024-06-30T11:53:01.310902+07:00" + description: Expose your service in Kubernetes to the Internet with open source + FRP! + digest: fd40569a8b3140f36a6c987dc16746b7f9802c36caf738938f8d0e60827ff103 + home: https://github.com/zufardhiyaulhaq/frp-operator + maintainers: + - email: zufardhiyaulhaq@gmail.com + name: Zufar Dhiyaulhaq + url: https://zufardhiyaulhaq.com + name: frp-operator + type: application + urls: + - frp-operator-1.2.0.tgz + version: 1.2.0 - apiVersion: v2 appVersion: 0.3.0 - created: "2024-04-13T22:50:20.361732+07:00" + created: "2024-06-30T11:53:01.310409+07:00" description: Expose your service in Kubernetes to the Internet with open source FRP! digest: 96f342725e362414480ad385e0ad6db348754e8e3bf5db0d9a7e74ee9c5905a7 @@ -19,7 +35,7 @@ entries: version: 1.1.0 - apiVersion: v2 appVersion: 0.2.0 - created: "2024-04-13T22:50:20.360889+07:00" + created: "2024-06-30T11:53:01.309841+07:00" description: Expose your service in Kubernetes to the Internet with open source FRP! digest: 5f80631b3ce1dad5ed2039abb144506fa5795d378f4d465d33c475f216b77df1 @@ -33,4 +49,4 @@ entries: urls: - frp-operator-1.0.0.tgz version: 1.0.0 -generated: "2024-04-13T22:50:20.359307+07:00" +generated: "2024-06-30T11:53:01.309192+07:00" diff --git a/go.mod b/go.mod index 21688d2..850cbb2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/zufardhiyaulhaq/frp-operator -go 1.22 +go 1.19 require ( k8s.io/api v0.26.2 diff --git a/go.sum b/go.sum index e72547b..66b7418 100644 --- a/go.sum +++ b/go.sum @@ -67,7 +67,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -216,9 +215,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= -github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -285,7 +282,6 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=