Merge pull request crossplane#6296 from jbw976/xpkg-default

Update default registry to xpkg.crossplane.io

Author: jbw976

.github/workflows/promote.yml

@@ -26,6 +26,7 @@ env:
   # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
   # credentials have been provided before trying to run steps that need them.
   DOCKER_USR: ${{ secrets.DOCKER_USR }}
+  GHCR_USR: ${{ github.actor }}
   AWS_USR: ${{ secrets.AWS_USR }}
   UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
 
@@ -52,6 +53,15 @@ jobs:
             --secret DOCKER_PASSWORD=${{ secrets.DOCKER_PSW }} \
             +ci-promote-image --CHANNEL=${{ inputs.channel }} --CROSSPLANE_VERSION=${{ inputs.version }} --CROSSPLANE_REPO=docker.io/crossplane/crossplane
 
+      - name: Promote Image to ghcr.io/crossplane/crossplane:${{ inputs.channel }}
+        if: env.GHCR_USR != ''
+        run: |
+          earthly --strict \
+            --push \
+            --secret DOCKER_USER=${{ github.actor }} \
+            --secret DOCKER_PASSWORD=${{ secrets.GITHUB_TOKEN }} \
+            +ci-promote-image --CHANNEL=${{ inputs.channel }} --CROSSPLANE_VERSION=${{ inputs.version }} --CROSSPLANE_REPO=ghcr.io/crossplane/crossplane
+
       - name: Promote Image to xpkg.upbound.io/crossplane/crossplane:${{ inputs.channel }}
         if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
         run: |

Earthfile

@@ -372,6 +372,7 @@ ci-version:
 ci-artifacts:
   BUILD +multiplatform-build \
     --CROSSPLANE_REPO=index.docker.io/crossplane/crossplane \
+    --CROSSPLANE_REPO=ghcr.io/crossplane/crossplane \
     --CROSSPLANE_REPO=xpkg.upbound.io/crossplane/crossplane
 
 # ci-codeql-setup sets up CodeQL for the ci-codeql target.

cluster/charts/crossplane/README.md

@@ -80,7 +80,7 @@ and their default values.
 | `function.packages` | A list of Function packages to install | `[]` |
 | `hostNetwork` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. Consider setting `dnsPolicy` to `ClusterFirstWithHostNet`. | `false` |
 | `image.pullPolicy` | The image pull policy used for Crossplane and RBAC Manager pods. | `"IfNotPresent"` |
-| `image.repository` | Repository for the Crossplane pod image. | `"xpkg.upbound.io/crossplane/crossplane"` |
+| `image.repository` | Repository for the Crossplane pod image. | `"xpkg.crossplane.io/crossplane/crossplane"` |
 | `image.tag` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | `""` |
 | `imagePullSecrets` | The imagePullSecret names to add to the Crossplane ServiceAccount. | `[]` |
 | `leaderElection` | Enable [leader election](https://docs.crossplane.io/latest/concepts/pods/#leader-election) for the Crossplane pod. | `true` |
@@ -164,7 +164,7 @@ replicas: 1
 deploymentStrategy: RollingUpdate
 
 image:
-  repository: xpkg.upbound.io/crossplane/crossplane
+  repository: xpkg.crossplane.io/crossplane/crossplane
   tag: alpha
   pullPolicy: Always
 ```

cluster/charts/crossplane/README.md.gotmpl

@@ -93,7 +93,7 @@ replicas: 1
 deploymentStrategy: RollingUpdate
 
 image:
-  repository: xpkg.upbound.io/crossplane/crossplane
+  repository: xpkg.crossplane.io/crossplane/crossplane
   tag: alpha
   pullPolicy: Always
 ```

cluster/charts/crossplane/values.yaml

@@ -12,7 +12,7 @@ deploymentStrategy: RollingUpdate
 
 image:
   # -- Repository for the Crossplane pod image.
-  repository: xpkg.upbound.io/crossplane/crossplane
+  repository: xpkg.crossplane.io/crossplane/crossplane
   # -- The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`.
   tag: ""
   # -- The image pull policy used for Crossplane and RBAC Manager pods.

cmd/crank/beta/convert/deploymentruntime/converter_test.go

@@ -39,7 +39,7 @@ func TestNewDeploymentTemplateFromControllerConfig(t *testing.T) {
 	user := int64(33)
 	saName := "sa-name"
 	className := "className"
-	image := "xpkg.upbound.io/crossplane/crossplane:latest"
+	image := "xpkg.crossplane.io/crossplane/crossplane:latest"
 	timeNow := metav1.NewTime(time.Now())
 
 	type args struct {
@@ -311,7 +311,7 @@ func TestControllerConfigToRuntimeDeploymentConfig(t *testing.T) {
 }
 
 func TestNewContainerFromControllerConfig(t *testing.T) {
-	image := "xpkg.upbound.io/crossplane/crossplane:latest"
+	image := "xpkg.crossplane.io/crossplane/crossplane:latest"
 	priv := false
 	pullAlways := corev1.PullAlways
 

cmd/crank/beta/validate/cmd.go

@@ -68,7 +68,7 @@ Examples:
   crossplane beta validate extensions.yaml resources.yaml
 
   # Validate all resources in the resources.yaml file against the extensions in the extensions.yaml file using a specific Crossplane image version
-  crossplane beta validate extensions.yaml resources.yaml --crossplane-image=xpkg.upbound.io/crossplane/crossplane:v1.16.0
+  crossplane beta validate extensions.yaml resources.yaml --crossplane-image=xpkg.crossplane.io/crossplane/crossplane:v1.20.0
 
   # Validate all resources in the resourceDir folder against the extensions in the extensionsDir folder and skip
   # success logs

internal/xpkg/name.go

@@ -61,7 +61,7 @@ const (
 
 	// DefaultRegistry is the registry name that will be used when no registry
 	// is provided.
-	DefaultRegistry string = "xpkg.upbound.io"
+	DefaultRegistry string = "xpkg.crossplane.io"
 )
 
 const (

internal/xpkg/upbound/credhelper/credhelper_test.go

@@ -35,7 +35,7 @@ import (
 var _ credentials.Helper = &Helper{}
 
 func TestGet(t *testing.T) {
-	testServer := "xpkg.upbound.io"
+	testServer := "xpkg.crossplane.io"
 	testProfile := "test"
 	testSecret := "supersecretvalue"
 	errBoom := errors.New("boom")

test/e2e/manifests/pkg/configuration/dependency/configuration.yaml

@@ -7,4 +7,4 @@ kind: Configuration
 metadata:
   name: depends-on-provider-nop
 spec:
-  package: crossplane/e2e-depends-on-provider-nop:v0.3.0
+  package: crossplane/e2e-depends-on-provider-nop:v0.3.1