diff --git a/.github/workflows/image-build-push-dev.yaml b/.github/workflows/image-build-push-dev.yaml index 2ba7fd96c..cfec3be22 100644 --- a/.github/workflows/image-build-push-dev.yaml +++ b/.github/workflows/image-build-push-dev.yaml @@ -7,8 +7,8 @@ on: workflow_dispatch: env: - REGISTRY: docker.io - ORG: nephio + REGISTRY: ghcr.io + ORG: kptdev permissions: contents: read @@ -22,13 +22,13 @@ jobs: matrix: include: - dockerfile: ./build/Dockerfile - image: docker.io/nephio/porch-server + image: ghcr.io/kptdev/porch-server - dockerfile: ./controllers/Dockerfile - image: docker.io/nephio/porch-controllers + image: ghcr.io/kptdev/porch-controllers - dockerfile: ./func/Dockerfile - image: docker.io/nephio/porch-function-runner + image: ghcr.io/kptdev/porch-function-runner - dockerfile: ./func/Dockerfile-wrapperserver - image: docker.io/nephio/porch-wrapper-server + image: ghcr.io/kptdev/porch-wrapper-server permissions: contents: read packages: write @@ -53,8 +53,8 @@ jobs: uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: registry: ${{ env.REGISTRY }} - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 diff --git a/.github/workflows/image-build-push-release.yaml b/.github/workflows/image-build-push-release.yaml index 683937aa6..eb674eece 100644 --- a/.github/workflows/image-build-push-release.yaml +++ b/.github/workflows/image-build-push-release.yaml @@ -7,8 +7,8 @@ on: - "v[0-9]+.[0-9]+.[0-9]-pre[0-9]+" env: - REGISTRY: docker.io - ORG: nephio + REGISTRY: ghcr.io + ORG: kptdev permissions: contents: read @@ -22,13 +22,13 @@ jobs: matrix: include: - dockerfile: ./build/Dockerfile - image: docker.io/nephio/porch-server + image: ghcr.io/kptdev/porch-server - dockerfile: ./controllers/Dockerfile - image: docker.io/nephio/porch-controllers + image: ghcr.io/kptdev/porch-controllers - dockerfile: ./func/Dockerfile - image: docker.io/nephio/porch-function-runner + image: ghcr.io/kptdev/porch-function-runner - dockerfile: ./func/Dockerfile-wrapperserver - image: docker.io/nephio/porch-wrapper-server + image: ghcr.io/kptdev/porch-wrapper-server permissions: contents: read packages: write @@ -53,8 +53,8 @@ jobs: uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: registry: ${{ env.REGISTRY }} - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 671c76a24..3b2258bd0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,7 +39,7 @@ jobs: uses: ./.github/actions/setup-go-kpt - name: Build porch blueprint - run: PATH=./bin:$PATH IMAGE_REPO=docker.io/nephio IMAGE_TAG=${{ github.ref_name }} PORCH_CACHE_TYPE=CR make deployment-config + run: PATH=./bin:$PATH IMAGE_REPO=ghcr.io/kptdev IMAGE_TAG=${{ github.ref_name }} PORCH_CACHE_TYPE=CR make deployment-config - name: Run GoReleaser id: run-goreleaser diff --git a/Makefile b/Makefile index 95de5e066..c2ffa36a8 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,8 @@ export DEPLOYPORCHCONFIGDIR ?= $(BUILDDIR)/deploy DEPLOYKPTCONFIGDIR=$(BUILDDIR)/kpt_pkgs # Image configuration -export IMAGE_REPO ?= docker.io/nephio -export USER ?= nephio +export IMAGE_REPO ?= ghcr.io/kptdev +export USER ?= porch export IMAGE_TAG ifndef IMAGE_TAG diff --git a/controllers/Makefile b/controllers/Makefile index e96391402..12df525f0 100644 --- a/controllers/Makefile +++ b/controllers/Makefile @@ -13,7 +13,7 @@ # limitations under the License. IMAGE_TAG ?= latest -IMAGE_REPO ?= docker.io/nephio +IMAGE_REPO ?= ghcr.io/kptdev IMAGE_NAME ?= porch-controllers .PHONY: build-image docker-build diff --git a/deployments/function-pods/deployment.yaml b/deployments/function-pods/deployment.yaml index 626f84daa..9dcee5ed3 100644 --- a/deployments/function-pods/deployment.yaml +++ b/deployments/function-pods/deployment.yaml @@ -26,7 +26,7 @@ data: spec: initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: - cp - -a diff --git a/deployments/porch/2-function-runner.yaml b/deployments/porch/2-function-runner.yaml index eae6de2fe..b4a6bdbdb 100644 --- a/deployments/porch/2-function-runner.yaml +++ b/deployments/porch/2-function-runner.yaml @@ -35,7 +35,7 @@ spec: serviceAccountName: porch-fn-runner containers: - name: function-runner - image: docker.io/nephio/porch-function-runner:latest + image: ghcr.io/kptdev/porch-function-runner:latest imagePullPolicy: IfNotPresent securityContext: runAsNonRoot: true @@ -51,7 +51,7 @@ spec: - --functions=/home/nonroot/functions env: - name: WRAPPER_SERVER_IMAGE - value: docker.io/nephio/porch-wrapper-server:latest + value: ghcr.io/kptdev/porch-wrapper-server:latest - name: OTEL_METRICS_EXPORTER value: "prometheus" - name: OTEL_EXPORTER_PROMETHEUS_HOST diff --git a/deployments/porch/22-function-templates.yaml b/deployments/porch/22-function-templates.yaml index 922611be2..79692a9f8 100644 --- a/deployments/porch/22-function-templates.yaml +++ b/deployments/porch/22-function-templates.yaml @@ -24,7 +24,7 @@ template: spec: initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: - cp - -a diff --git a/deployments/porch/3-porch-server.yaml b/deployments/porch/3-porch-server.yaml index a48c09073..edbeac647 100644 --- a/deployments/porch/3-porch-server.yaml +++ b/deployments/porch/3-porch-server.yaml @@ -43,7 +43,7 @@ spec: containers: - name: porch-server # Update image to the image of your porch apiserver build. - image: docker.io/nephio/porch-server:latest + image: ghcr.io/kptdev/porch-server:latest imagePullPolicy: IfNotPresent securityContext: runAsNonRoot: true diff --git a/deployments/porch/9-controllers.yaml b/deployments/porch/9-controllers.yaml index 8291511e6..a3ae8adb6 100644 --- a/deployments/porch/9-controllers.yaml +++ b/deployments/porch/9-controllers.yaml @@ -41,7 +41,7 @@ spec: containers: - name: porch-controllers # Update to the image of your porch-controllers build. - image: docker.io/nephio/porch-controllers:latest + image: ghcr.io/kptdev/porch-controllers:latest imagePullPolicy: IfNotPresent args: - --repositories.cache-type=DB diff --git a/deployments/porch/README.md b/deployments/porch/README.md index 751c88ae2..b9c5397b5 100644 --- a/deployments/porch/README.md +++ b/deployments/porch/README.md @@ -36,7 +36,7 @@ make deployment-config #### Available flags - `PORCH_CACHE_TYPE`: Set cache type (`DB` or `CR`) (default: `CR`) - `IMAGE_TAG`: Set image tag (default: `{USER}-{git-hash}`) -- `IMAGE_REPO`: Set image repository (default: `docker.io/nephio`) +- `IMAGE_REPO`: Set image repository (default: `ghcr.io/kptdev`) - `ENABLED_RECONCILERS`: Comma-separated list of reconcilers (default: `packagevariants,packagevariantsets,repositories`) - `FN_RUNNER_WARM_UP_POD_CACHE`: Enable/disable pod cache warm-up (default: `true`) diff --git a/docs/content/en/docs/6_configuration_and_deployments/configurations/components/function-runner-config/pod-templates.md b/docs/content/en/docs/6_configuration_and_deployments/configurations/components/function-runner-config/pod-templates.md index 53f04ef11..5937b4733 100644 --- a/docs/content/en/docs/6_configuration_and_deployments/configurations/components/function-runner-config/pod-templates.md +++ b/docs/content/en/docs/6_configuration_and_deployments/configurations/components/function-runner-config/pod-templates.md @@ -80,14 +80,14 @@ spec: serviceAccountName: porch-fn-runner containers: - name: function-runner - image: docker.io/nephio/porch-function-runner:latest + image: ghcr.io/kptdev/porch-function-runner:latest args: - --port=9445 - --pod-namespace=porch-fn-system - --function-pod-template=kpt-function-eval-pod-template env: - name: WRAPPER_SERVER_IMAGE - value: docker.io/nephio/porch-wrapper-server:latest + value: ghcr.io/kptdev/porch-wrapper-server:latest ``` ### Step 3: Create the ConfigMap @@ -113,7 +113,7 @@ data: spec: initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: - cp - -a @@ -160,7 +160,7 @@ data: spec: initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: [cp, -a, /home/nonroot/wrapper-server/., /wrapper-server-tools] volumeMounts: - name: wrapper-server-tools @@ -202,7 +202,7 @@ data: type: RuntimeDefault initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: [cp, -a, /home/nonroot/wrapper-server/., /wrapper-server-tools] securityContext: allowPrivilegeEscalation: false @@ -246,7 +246,7 @@ data: effect: "NoSchedule" initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: [cp, -a, /home/nonroot/wrapper-server/., /wrapper-server-tools] volumeMounts: - name: wrapper-server-tools diff --git a/docs/content/en/docs/6_configuration_and_deployments/configurations/opentelemetry.md b/docs/content/en/docs/6_configuration_and_deployments/configurations/opentelemetry.md index 42a4de879..8b10fe3d6 100644 --- a/docs/content/en/docs/6_configuration_and_deployments/configurations/opentelemetry.md +++ b/docs/content/en/docs/6_configuration_and_deployments/configurations/opentelemetry.md @@ -314,7 +314,7 @@ data: spec: initContainers: - name: copy-wrapper-server - image: docker.io/nephio/porch-wrapper-server:latest + image: ghcr.io/kptdev/porch-wrapper-server:latest command: - cp - -a diff --git a/examples/apps/hello-server/Makefile b/examples/apps/hello-server/Makefile index af7f2441c..50793c2e4 100644 --- a/examples/apps/hello-server/Makefile +++ b/examples/apps/hello-server/Makefile @@ -13,7 +13,7 @@ # limitations under the License. IMAGE_TAG ?= latest -IMAGE_REPO ?= docker.io/nephio +IMAGE_REPO ?= ghcr.io/kptdev IMAGE_NAME ?= hello-server # Go development, testing, and quality tools diff --git a/func/Makefile b/func/Makefile index 8e88a0967..4df1bd297 100644 --- a/func/Makefile +++ b/func/Makefile @@ -13,7 +13,7 @@ # limitations under the License. IMAGE_TAG ?= latest -IMAGE_REPO ?= docker.io/nephio +IMAGE_REPO ?= ghcr.io/kptdev IMAGE_NAME ?= function-runner WRAPPER_SERVER_IMAGE_NAME ?= wrapper-server COMPILED_PROTO=evaluator/evaluator_grpc.pb.go evaluator/evaluator.pb.go diff --git a/scripts/common.sh b/scripts/common.sh index df0a23f43..a7824778d 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -3,7 +3,7 @@ # NOTE: Users should use root Makefile targets instead of calling scripts directly # Only set defaults if variables are not already exported from Makefile -IMAGE_REPO=${IMAGE_REPO:-docker.io/nephio} +IMAGE_REPO=${IMAGE_REPO:-ghcr.io/kptdev} PORCH_SERVER_IMAGE=${PORCH_SERVER_IMAGE:-porch-server} PORCH_CONTROLLERS_IMAGE=${PORCH_CONTROLLERS_IMAGE:-porch-controllers} diff --git a/scripts/create-deployment-blueprint.sh b/scripts/create-deployment-blueprint.sh index c5e51e3b4..4090d0a30 100755 --- a/scripts/create-deployment-blueprint.sh +++ b/scripts/create-deployment-blueprint.sh @@ -401,16 +401,16 @@ function main() { customize_controller_reconcilers customize_image \ - "docker.io/nephio/porch-function-runner:latest" \ + "ghcr.io/kptdev/porch-function-runner:latest" \ "${FUNCTION_IMAGE}" customize_image \ - "docker.io/nephio/porch-server:latest" \ + "ghcr.io/kptdev/porch-server:latest" \ "${SERVER_IMAGE}" customize_image \ - "docker.io/nephio/porch-controllers:latest" \ + "ghcr.io/kptdev/porch-controllers:latest" \ "${CONTROLLERS_IMAGE}" customize_image_in_env \ - "docker.io/nephio/porch-wrapper-server:latest" \ + "ghcr.io/kptdev/porch-wrapper-server:latest" \ "${WRAPPER_SERVER_IMAGE}" if [[ -n "${DOCKERHUB_MIRROR}" ]]; then diff --git a/test/Makefile b/test/Makefile index dc47aed8d..8914c7d09 100644 --- a/test/Makefile +++ b/test/Makefile @@ -13,7 +13,7 @@ # limitations under the License. IMAGE_TAG ?= latest -IMAGE_REPO ?= docker.io/nephio +IMAGE_REPO ?= ghcr.io/kptdev IMAGE_NAME ?= test-git-server .PHONY: build-image docker-build