From e901f314c72a05a0c1bcc6ac291c00cfe3fff1b4 Mon Sep 17 00:00:00 2001
From: Oleksandr Bystrov <63246999+abystrov@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:48:55 +0100
Subject: [PATCH 1/3] Make possible to use private repos during the build

---
 .github/workflows/docker-helm.yml | 4 ++++
 Dockerfile                        | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-helm.yml b/.github/workflows/docker-helm.yml
index e9b3a8d0..7b3bc353 100644
--- a/.github/workflows/docker-helm.yml
+++ b/.github/workflows/docker-helm.yml
@@ -91,6 +91,8 @@ jobs:
         build-args: |
           BUILD_SHA=${{ steps.extract_info.outputs.head }}
           BUILD_VERSION=latest
+          private_repo=github.com/AccessibleAI/cnvrg-shim
+          git_auth=${{ secrets.CNVRG_RUNNER_AUTH }}
 
     - name: Build and push tagged image
       id: docker_build_tag
@@ -104,6 +106,8 @@ jobs:
         build-args: |
           BUILD_SHA=${{ steps.extract_info.outputs.head }}
           BUILD_VERSION=${{ steps.tag_bump.outputs.new_tag }}
+          private_repo=github.com/AccessibleAI/cnvrg-shim
+          git_auth=${{ secrets.CNVRG_RUNNER_AUTH }}
 
     - name: Build and push tagged image
       id: docker_build_tag_branch
diff --git a/Dockerfile b/Dockerfile
index d07b5c2c..1cf0b67b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,10 @@
 # Build the manager binary
 FROM golang:1.19.1 as builder
+
 ARG git_auth
-ENV GOPRIVATE=github.com/AccessibleAI/cnvrg-shim
+ARG private_repo
+
+ENV GOPRIVATE=$private_repo
 WORKDIR /workspace
 RUN git config --global --add url.https://$git_auth@github.com/.insteadOf https://github.com/
 # Copy the Go Modules manifests

From f4a23edb101038b635b2a74d9bfebaa838f47f75 Mon Sep 17 00:00:00 2001
From: Oleksandr Bystrov <63246999+abystrov@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:10:14 +0100
Subject: [PATCH 2/3] Fixup

---
 .github/workflows/docker-helm.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-helm.yml b/.github/workflows/docker-helm.yml
index 7b3bc353..8a025c47 100644
--- a/.github/workflows/docker-helm.yml
+++ b/.github/workflows/docker-helm.yml
@@ -91,8 +91,6 @@ jobs:
         build-args: |
           BUILD_SHA=${{ steps.extract_info.outputs.head }}
           BUILD_VERSION=latest
-          private_repo=github.com/AccessibleAI/cnvrg-shim
-          git_auth=${{ secrets.CNVRG_RUNNER_AUTH }}
 
     - name: Build and push tagged image
       id: docker_build_tag
@@ -121,6 +119,8 @@ jobs:
         build-args: |
           BUILD_SHA=${{ steps.extract_info.outputs.head }}
           BUILD_VERSION=${{ steps.tag_bump.outputs.new_tag }}
+          private_repo=github.com/AccessibleAI/cnvrg-shim
+          git_auth=${{ secrets.CNVRG_RUNNER_AUTH }}
 
     - name: Generate Cnvrg Changelog
       uses: AccessibleAI/github-changelog-action@1.0.0

From d99d99c8275984b14fe266f445b01fc7c06c7963 Mon Sep 17 00:00:00 2001
From: bradsoper <107413559+bradsoper@users.noreply.github.com>
Date: Wed, 7 Feb 2024 12:48:55 -0800
Subject: [PATCH 3/3] Update svc.tpl

Updated port to use the port defined in the values file. Before it was hard coded to port 80
---
 pkg/app/dbs/tmpl/minio/svc.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/app/dbs/tmpl/minio/svc.tpl b/pkg/app/dbs/tmpl/minio/svc.tpl
index 384162d2..b623ce03 100644
--- a/pkg/app/dbs/tmpl/minio/svc.tpl
+++ b/pkg/app/dbs/tmpl/minio/svc.tpl
@@ -21,10 +21,10 @@ spec:
   {{- end }}
   ports:
   - name: http
-    port: 80
+    port: {{ .Spec.Dbs.Minio.Port }}
     targetPort: {{ .Spec.Dbs.Minio.Port }}
     {{- if eq .Spec.Networking.Ingress.Type "nodeport" }}
     nodePort: {{ .Spec.Dbs.Minio.NodePort }}
     {{- end }}
   selector:
-    app: {{ .Spec.Dbs.Minio.SvcName }}
\ No newline at end of file
+    app: {{ .Spec.Dbs.Minio.SvcName }}