Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/image-build-push-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
workflow_dispatch:

env:
REGISTRY: docker.io
ORG: nephio
REGISTRY: ghcr.io
ORG: kptdev
Comment thread
liamfallon marked this conversation as resolved.

permissions:
contents: read
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/image-build-push-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
liamfallon marked this conversation as resolved.

permissions:
contents: read
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
liamfallon marked this conversation as resolved.
export USER ?= porch

export IMAGE_TAG
ifndef IMAGE_TAG
Expand Down
2 changes: 1 addition & 1 deletion controllers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/function-pods/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployments/porch/2-function-runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/porch/22-function-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/porch/3-porch-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/porch/9-controllers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/porch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/hello-server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion func/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions scripts/create-deployment-blueprint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading