Use Kubeflow Docker Hub for Spark Operator Image (#1974)

* Use Kubeflow Docker Hub for Spark Operator Image Signed-off-by: Andrey Velichkevich <[email protected]> * Bump Helm Chart version Signed-off-by: Andrey Velichkevich <[email protected]> --------- Signed-off-by: Andrey Velichkevich <[email protected]>
kubeflow · Apr 17, 2024 · dede190 · dede190
1 parent 1d3e385
commit dede190
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: "0"
 
       - name: The API should not change once published
         run: |
@@ -79,7 +79,7 @@ jobs:
 
       - name: Build Spark-Operator Docker Image
         run: |
-          docker build -t ghcr.io/kubeflow/spark-operator:latest .
+          docker build -t docker.io/kubeflow/spark-operator:latest .
 
       - name: Check changes in resources used in docker file
         run: |
@@ -89,7 +89,7 @@ jobs:
             if ! git diff  --quiet origin/master -- $resource; then
               ## And the appVersion hasn't been updated
               if ! git diff origin/master -- charts/spark-operator-chart/Chart.yaml | grep +appVersion; then
-                echo "resource used in ghcr.io/kubeflow/spark-operator has changed in $resource, need to update the appVersion in charts/spark-operator-chart/Chart.yaml"
+                echo "resource used in docker.io/kubeflow/spark-operator has changed in $resource, need to update the appVersion in charts/spark-operator-chart/Chart.yaml"
                 git diff origin/master -- $resource;
                 echo "failing the build... " && false
               fi
@@ -147,8 +147,8 @@ jobs:
 
       - name: Run chart-testing (install)
         run: |
-          docker build -t ghcr.io/kubeflow/spark-operator:local .
-          minikube image load ghcr.io/kubeflow/spark-operator:local
+          docker build -t docker.io/kubeflow/spark-operator:local .
+          minikube image load docker.io/kubeflow/spark-operator:local
           ct install
 
   integration-test:
@@ -174,8 +174,8 @@ jobs:
 
       - name: Build local spark-operator docker image for minikube testing
         run: |
-          docker build -t ghcr.io/kubeflow/spark-operator:local .
-          minikube image load ghcr.io/kubeflow/spark-operator:local
+          docker build -t docker.io/kubeflow/spark-operator:local .
+          minikube image load docker.io/kubeflow/spark-operator:local
 
       # The integration tests are currently broken see: https://github.com/kubeflow/spark-operator/issues/1416
       # - name: Run chart-testing (integration test)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
 env:
-  REGISTRY_IMAGE: ghcr.io/kubeflow/spark-operator
+  REGISTRY_IMAGE: docker.io/kubeflow/spark-operator
 
 jobs:
   build-skip-check:
@@ -67,10 +67,10 @@ jobs:
       - name: Login to Packages Container registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: docker.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and Push Spark-Operator Docker Image to github container registry
+      - name: Build and Push Spark-Operator Docker Image to Docker Hub
         id: build
         uses: docker/build-push-action@v5
         with:
@@ -116,9 +116,9 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |

diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: spark-operator
 description: A Helm chart for Spark on Kubernetes operator
-version: 1.2.8
+version: 1.2.9
 appVersion: v1beta2-1.4.3-3.5.0
 keywords:
   - spark

diff --git a/charts/spark-operator-chart/README.md b/charts/spark-operator-chart/README.md
@@ -1,6 +1,6 @@
 # spark-operator
 
-![Version: 1.2.8](https://img.shields.io/badge/Version-1.2.8-informational?style=flat-square) ![AppVersion: v1beta2-1.4.3-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.3--3.5.0-informational?style=flat-square)
+![Version: 1.2.9](https://img.shields.io/badge/Version-1.2.9-informational?style=flat-square) ![AppVersion: v1beta2-1.4.3-3.5.0](https://img.shields.io/badge/AppVersion-v1beta2--1.4.3--3.5.0-informational?style=flat-square)
 
 A Helm chart for Spark on Kubernetes operator
 
@@ -86,7 +86,7 @@ See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall) for command docum
 | envFrom | list | `[]` | Pod environment variable sources |
 | fullnameOverride | string | `""` | String to override release name |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| image.repository | string | `"ghcr.io/kubeflow/spark-operator"` | Image repository |
+| image.repository | string | `"docker.io/kubeflow/spark-operator"` | Image repository |
 | image.tag | string | `""` | if set, override the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Image pull secrets |
 | ingressUrlFormat | string | `""` | Ingress URL format. Requires the UI service to be enabled by setting `uiService.enable` to true. |

diff --git a/charts/spark-operator-chart/values.yaml b/charts/spark-operator-chart/values.yaml
@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   # -- Image repository
-  repository: ghcr.io/kubeflow/spark-operator
+  repository: docker.io/kubeflow/spark-operator
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- if set, override the image tag whose default is the chart appVersion.