From 515e3653a93e5c9ad770ac6956523911c598c810 Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Fri, 14 Feb 2025 14:18:37 -0500 Subject: [PATCH 1/5] Port mapping cleanup --- charts/whatsapp-proxy-chart/Chart.yaml | 2 +- .../whatsapp-proxy-chart/templates/service.yaml | 17 ++++++++++++++++- charts/whatsapp-proxy-chart/values.yaml | 16 +++++++++------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/charts/whatsapp-proxy-chart/Chart.yaml b/charts/whatsapp-proxy-chart/Chart.yaml index 53f0a70..2e1340c 100644 --- a/charts/whatsapp-proxy-chart/Chart.yaml +++ b/charts/whatsapp-proxy-chart/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/whatsapp-proxy-chart/templates/service.yaml b/charts/whatsapp-proxy-chart/templates/service.yaml index 22d5c23..d202eec 100644 --- a/charts/whatsapp-proxy-chart/templates/service.yaml +++ b/charts/whatsapp-proxy-chart/templates/service.yaml @@ -54,9 +54,24 @@ spec: {{- end}} {{- if .Values.service.stats_port }} - port: {{ .Values.service.stats_port }} - targetPort: {{ .Values.service.stats_port }} + targetPort: 8199 protocol: TCP name: stats {{- end}} + {{- if .Values.service.media_port }} + - port: {{ .Values.service.media_port }} + targetPort: 587 + protocl: TCP + name: media + {{- end}} + + {{- if .Values.service.media_proxy_port }} + - port: {{ .Values.service.media_proxy_port }} + targetPort: 7777 + protocl: TCP + name: media + {{- end}} + + selector: {{- include "whatsapp-proxy-chart.selectorLabels" . | nindent 4 }} diff --git a/charts/whatsapp-proxy-chart/values.yaml b/charts/whatsapp-proxy-chart/values.yaml index d4a1689..140011b 100644 --- a/charts/whatsapp-proxy-chart/values.yaml +++ b/charts/whatsapp-proxy-chart/values.yaml @@ -48,15 +48,17 @@ securityContext: {} # runAsUser: 1000 service: - type: ClusterIP + type: LoadBalancer annotations: {} port: 8080 - # http_port: 80 - # https_port: 443 - # jabber_port: 5222 - http_proxy_port: 8080 - https_proxy_port: 8443 - jabber_proxy_port: 8222 + http_port: 80 + https_port: 443 + jabber_port: 5222 + media_port: 587 + # http_proxy_port: 8080 + # https_proxy_port: 8443 + # jabber_proxy_port: 8222 + # media_proxy_port: 7777 # stats_port: 8199 ingress: From 217e934a9dc1b2d8b9fede04cc6072e1096693b3 Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Fri, 14 Feb 2025 15:27:03 -0500 Subject: [PATCH 2/5] Fix docker CI for PRs --- .github/workflows/docker-build-pr.yml | 38 +++++++++++++++++++++++++++ .github/workflows/docker-image.yml | 12 +++------ 2 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/docker-build-pr.yml diff --git a/.github/workflows/docker-build-pr.yml b/.github/workflows/docker-build-pr.yml new file mode 100644 index 0000000..d92feba --- /dev/null +++ b/.github/workflows/docker-build-pr.yml @@ -0,0 +1,38 @@ +name: Docker Image Build for PRs + +# Run on every push to main + weekly, Sunday @ midnight +# to keep the image fresh +on: + pull_request: + types: [opened, reopened, sychronize] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Docker metadata + id: meta + uses: docker/metadata-action@v4 + with: + images: facebook/whatsapp_proxy + tags: | + type=raw,value={{date 'YYYYMMDD'}} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build PR + uses: docker/build-push-action@v3 + with: + context: ./proxy + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 + push: false + tags: | + ${{ steps.meta.outputs.tags }} + facebook/whatsapp_proxy:latest diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 502cbe6..226b4e8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: Docker Build and PR for Main # Run on every push to main + weekly, Sunday @ midnight # to keep the image fresh @@ -7,9 +7,6 @@ on: branches: [ "main" ] schedule: - cron: "0 0 * * 0" - # On pull-requests only a build is run, not a push to Docker Hub - pull_request: - types: [opened, reopened, synchronize] jobs: @@ -19,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - + - name: Docker metadata id: meta uses: docker/metadata-action@v4 @@ -33,13 +30,13 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - + - name: Login to dockerhub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - + - name: Build and push uses: docker/build-push-action@v3 with: @@ -49,4 +46,3 @@ jobs: tags: | ${{ steps.meta.outputs.tags }} facebook/whatsapp_proxy:latest - From b4fe2a4a3e0c50696f07aa4c1a41066a3d2819b4 Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Tue, 18 Feb 2025 22:05:55 -0500 Subject: [PATCH 3/5] change to NLB instead of a classic LB --- charts/whatsapp-proxy-chart/templates/service.yaml | 2 +- charts/whatsapp-proxy-chart/values.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/whatsapp-proxy-chart/templates/service.yaml b/charts/whatsapp-proxy-chart/templates/service.yaml index d202eec..52c91db 100644 --- a/charts/whatsapp-proxy-chart/templates/service.yaml +++ b/charts/whatsapp-proxy-chart/templates/service.yaml @@ -68,7 +68,7 @@ spec: {{- if .Values.service.media_proxy_port }} - port: {{ .Values.service.media_proxy_port }} targetPort: 7777 - protocl: TCP + protocol: TCP name: media {{- end}} diff --git a/charts/whatsapp-proxy-chart/values.yaml b/charts/whatsapp-proxy-chart/values.yaml index 140011b..52bab0c 100644 --- a/charts/whatsapp-proxy-chart/values.yaml +++ b/charts/whatsapp-proxy-chart/values.yaml @@ -49,7 +49,8 @@ securityContext: {} service: type: LoadBalancer - annotations: {} + annotations: + service.beta.kubernetes.io/aws-load-balancer-type: nlb port: 8080 http_port: 80 https_port: 443 From 0322ddceaf0c21d760a8098b280b89ef12b90192 Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Wed, 19 Feb 2025 20:06:07 -0500 Subject: [PATCH 4/5] Fix typo --- charts/whatsapp-proxy-chart/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/whatsapp-proxy-chart/templates/service.yaml b/charts/whatsapp-proxy-chart/templates/service.yaml index 52c91db..c4b154d 100644 --- a/charts/whatsapp-proxy-chart/templates/service.yaml +++ b/charts/whatsapp-proxy-chart/templates/service.yaml @@ -61,7 +61,7 @@ spec: {{- if .Values.service.media_port }} - port: {{ .Values.service.media_port }} targetPort: 587 - protocl: TCP + protocol: TCP name: media {{- end}} From 33931ff4fd4f23a69a789d4747b3b37bc3a51fcb Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Thu, 20 Feb 2025 10:37:07 -0500 Subject: [PATCH 5/5] Update docker-build-pr.yml --- .github/workflows/docker-build-pr.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-build-pr.yml b/.github/workflows/docker-build-pr.yml index d92feba..05e3c23 100644 --- a/.github/workflows/docker-build-pr.yml +++ b/.github/workflows/docker-build-pr.yml @@ -1,7 +1,5 @@ name: Docker Image Build for PRs -# Run on every push to main + weekly, Sunday @ midnight -# to keep the image fresh on: pull_request: types: [opened, reopened, sychronize]