Apply upbound patches

Signed-off-by: Hasan Turken <[email protected]>

.github/workflows/ci.yml

@@ -14,11 +14,10 @@ env:
   GOLANGCI_VERSION: 'v1.54.2'
   DOCKER_BUILDX_VERSION: 'v0.10.0'
 
-  # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
-  # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
+  # Common users. We can't run a step 'if secrets.DOCKER_USR != ""' but we can run
+  # a step 'if env.DOCKER_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 }}
-  AWS_USR: ${{ secrets.AWS_USR }}
   UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
 
 jobs:
@@ -402,26 +401,15 @@ jobs:
           username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
           password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }}
 
-      - name: Publish Artifacts to S3, Marketplace, DockerHub
+      - name: Publish Artifacts to Marketplace, DockerHub
         run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/}
-        if: env.AWS_USR != '' && env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
-          AWS_DEFAULT_REGION: us-east-1
-          GIT_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCS_GIT_USR: ${{ secrets.UPBOUND_BOT_GITHUB_USR }}
-          DOCS_GIT_PSW: ${{ secrets.UPBOUND_BOT_GITHUB_PSW }}
-
-      - name: Promote Artifacts in S3, DockerHub
-        if: github.ref == 'refs/heads/master' && env.AWS_USR != '' && env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
+
+      - name: Promote Artifacts in DockerHub
+        if: github.ref == 'refs/heads/master' && env.DOCKER_USR != ''
         run: make -j2 promote
         env:
           BRANCH_NAME: master
           CHANNEL: master
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
-          AWS_DEFAULT_REGION: us-east-1
 
   fuzz-test:
     runs-on: ubuntu-22.04

.github/workflows/commands.yml

@@ -31,24 +31,3 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         github_workspace: ${{ github.workspace }}
         version: v0.0.4
-
-  fresh:
-    runs-on: ubuntu-22.04
-    if: startsWith(github.event.comment.body, '/fresh')
-
-    steps:
-    - name: Extract Command
-      id: command
-      uses: xt0rted/slash-command-action@bf51f8f5f4ea3d58abc7eca58f77104182b23e88 # v2
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        command: fresh
-        reaction: "true"
-        reaction-type: "eyes"
-        allow-edits: "false"
-        permission-level: read
-    - name: Handle Command
-      uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        labels: stale

.github/workflows/promote.yml

@@ -27,8 +27,6 @@ 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 }}
-  AWS_USR: ${{ secrets.AWS_USR }}
-  UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
 
 jobs:
   promote-artifacts:
@@ -63,13 +61,9 @@ jobs:
           username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }}
           password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }}
 
-      - name: Promote Artifacts in S3, DockerHub, and Upbound Registry
-        if: env.AWS_USR != '' && env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
+      - name: Promote Artifacts in DockerHub and Upbound Registry
+        if: env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != ''
         run: make -j2 promote BRANCH_NAME=${GITHUB_REF##*/}
         env:
           VERSION: ${{ github.event.inputs.version }}
           CHANNEL: ${{ github.event.inputs.channel }}
-          PRE_RELEASE: ${{ github.event.inputs.pre-release }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
-          AWS_DEFAULT_REGION: us-east-1

Makefile

@@ -14,7 +14,6 @@ PLATFORMS ?= linux_amd64 linux_arm64 linux_arm linux_ppc64le darwin_amd64 darwin
 # ====================================================================================
 # Setup Output
 
-S3_BUCKET ?= crossplane.releases
 -include build/makelib/output.mk
 
 # ====================================================================================
@@ -31,7 +30,7 @@ GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
 
 GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/crossplane $(GO_PROJECT)/cmd/crank
 GO_TEST_PACKAGES = $(GO_PROJECT)/test/e2e
-GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.version=$(VERSION)
+GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.version=$(shell echo $(VERSION) | sed 's/[\.,-]up.*//' )
 GO_SUBDIRS += cmd internal apis
 GO111MODULE = on
 GOLANGCILINT_VERSION = 1.54.2
@@ -47,23 +46,12 @@ HELM3_VERSION = v3.13.1
 KIND_VERSION = v0.20.0
 -include build/makelib/k8s_tools.mk
 
-# ====================================================================================
-# Setup Helm
-
-HELM_BASE_URL = https://charts.crossplane.io
-HELM_S3_BUCKET = crossplane.charts
-HELM_CHARTS = crossplane
-HELM_CHART_LINT_ARGS_crossplane = --set nameOverride='',imagePullSecrets=''
-HELM_DOCS_ENABLED = true
-HELM_VALUES_TEMPLATE_SKIPPED = true
--include build/makelib/helm.mk
-
 # ====================================================================================
 # Setup Images
 # Due to the way that the shared build logic works, images should
 # all be in folders at the same level (no additional levels of nesting).
 
-REGISTRY_ORGS ?= docker.io/crossplane xpkg.upbound.io/crossplane
+REGISTRY_ORGS ?= docker.io/upbound xpkg.upbound.io/upbound
 IMAGES = crossplane
 -include build/makelib/imagelight.mk
 

README.md

@@ -1,127 +1,14 @@
-![CI](https://github.com/crossplane/crossplane/workflows/CI/badge.svg) [![GitHub release](https://img.shields.io/github/release/crossplane/crossplane/all.svg)](https://github.com/crossplane/crossplane/releases) [![Docker Pulls](https://img.shields.io/docker/pulls/crossplane/crossplane.svg)](https://hub.docker.com/r/crossplane/crossplane) [![Go Report Card](https://goreportcard.com/badge/github.com/crossplane/crossplane)](https://goreportcard.com/report/github.com/crossplane/crossplane) [![Slack](https://img.shields.io/badge/slack-crossplane-red?logo=slack)](https://slack.crossplane.io) [![Twitter Follow](https://img.shields.io/twitter/follow/crossplane_io?logo=X&label=Follow&style=flat)](https://twitter.com/intent/follow?screen_name=crossplane_io&user_id=788180534543339520)
+# Upbound Crossplane
 
-![Crossplane](banner.png)
+This is the [Upbound] maintained version of [Crossplane] which is bundled and
+shipped as part of the [Universal Crossplane].
 
-
-Crossplane is a framework for building cloud native control planes without
-needing to write code. It has a highly extensible backend that enables you to
-build a control plane that can orchestrate applications and infrastructure no
-matter where they run, and a highly configurable frontend that puts you in
-control of the schema of the declarative API it offers.
-
-Crossplane is a [Cloud Native Computing Foundation][cncf] project.
-
-## Get Started
-
-Crossplane's [Get Started Docs] cover install and cloud provider quickstarts.
-
-## Releases
-
-Currently maintained releases, as well as the next few upcoming releases are
-listed below. For more information take a look at the Crossplane [release cycle
-documentation].
-
-| Release | Release Date |   EOL    |
-|:-------:|:------------:|:--------:|
-|  v1.11  | Jan 31, 2023 | Oct 2023 |
-|  v1.12  | Apr 25, 2023 | Jan 2024 |
-|  v1.13  | Jul 27, 2023 | Apr 2024 |
-|  v1.14  | Late Oct '23 | Jul 2024 |
-|  v1.15  | Late Jan '24 | Oct 2024 |
-|  v1.16  | Late Apr '24 | Jan 2025 |
-
-You can subscribe to the [community calendar] to track all release dates, and
-find the most recent releases on the [releases] page.
-
-## Roadmap
-
-The public roadmap for Crossplane is published as a GitHub project board. Issues
-added to the roadmap have been triaged and identified as valuable to the
-community, and therefore a priority for the project that we expect to invest in.
-
-Milestones assigned to any issues in the roadmap are intended to give a sense of
-overall priority and the expected order of delivery. They should be considered
-approximate estimations and are **not** a strict commitment to a specific
-delivery timeline.
-
-[Crossplane Roadmap]
-
-## Get Involved
-
-Crossplane is a community driven project; we welcome your contribution. To file
-a bug, suggest an improvement, or request a new feature please open an [issue
-against Crossplane] or the relevant provider. Refer to our [contributing guide]
-for more information on how you can help.
-
-* Discuss Crossplane on [Slack] or our [developer mailing list].
-* Follow us on [Twitter], or contact us via [Email].
-* Join our regular community meetings.
-* Provide feedback on our [roadmap and releases board].
-
-The Crossplane community meeting takes place every other [Thursday at 10:00am
-Pacific Time][community meeting time]. Anyone who wants to discuss the direction
-of the project, design and implementation reviews, or raise general questions
-with the broader community is encouraged to join.
-
-* Meeting link: <https://zoom.us/j/425148449?pwd=NEk4N0tHWGpEazhuam1yR28yWHY5QT09>
-* [Current agenda and past meeting notes]
-* [Past meeting recordings]
-* [Community Calendar][community calendar]
-
-### Special Interest Groups (SIG)
-Each SIG collaborates in Slack and some groups have regular meetings, you can
-find the meetings in the [Community Calendar][community calendar].
-- [#sig-composition-environments][sig-composition-environments-slack]
-- [#sig-composition-functions][sig-composition-functions-slack]
-- [#sig-deletion-ordering][sig-deletion-ordering-slack]
-- [#sig-devex][sig-devex-slack]
-- [#sig-e2e-testing][sig-e2e-testing-slack]
-- [#sig-observability][sig-observability-slack]
-- [#sig-observe-only][sig-observe-only-slack]
-- [#sig-provider-families][sig-provider-families-slack]
-- [#sig-secret-stores][sig-secret-stores-slack]
-- [#sig-upjet-provider-efficiency][sig-upjet-provider-efficiency-slack]
-
-## Adopters
-
-A list of publicly known users of the Crossplane project can be found in [ADOPTERS.md].  We
-encourage all users of Crossplane to add themselves to this list - we want to see the community's
-growing success!
-
-## License
-
-Crossplane is under the Apache 2.0 license.
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fcrossplane%2Fcrossplane.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fcrossplane%2Fcrossplane?ref=badge_large)
+Please check the [Universal Crossplane Github Repo] and [documentation] for further
+details.
 
 <!-- Named links -->
-
+[Upbound]: https://www.upbound.io
 [Crossplane]: https://crossplane.io
-[release cycle documentation]: https://docs.crossplane.io/knowledge-base/guides/release-cycle
-[install]: https://crossplane.io/docs/latest
-[Slack]: https://slack.crossplane.io
-[developer mailing list]: https://groups.google.com/forum/#!forum/crossplane-dev
-[Twitter]: https://twitter.com/crossplane_io
-[Email]: mailto:[email protected]
-[issue against Crossplane]: https://github.com/crossplane/crossplane/issues
-[contributing guide]: contributing/README.md
-[community meeting time]: https://www.thetimezoneconverter.com/?t=10:00&tz=PT%20%28Pacific%20Time%29
-[Current agenda and past meeting notes]: https://docs.google.com/document/d/1q_sp2jLQsDEOX7Yug6TPOv7Fwrys6EwcF5Itxjkno7Y/edit?usp=sharing
-[Past meeting recordings]: https://www.youtube.com/playlist?list=PL510POnNVaaYYYDSICFSNWFqNbx1EMr-M
-[roadmap and releases board]: https://github.com/orgs/crossplane/projects/20/views/3?pane=info
-[cncf]: https://www.cncf.io/
-[Get Started Docs]: https://docs.crossplane.io/latest/getting-started/
-[community calendar]: https://calendar.google.com/calendar/embed?src=c_2cdn0hs9e2m05rrv1233cjoj1k%40group.calendar.google.com
-[releases]: https://github.com/crossplane/crossplane/releases
-[ADOPTERS.md]: ADOPTERS.md
-[Crossplane Roadmap]: https://github.com/orgs/crossplane/projects/20/views/3?pane=info
-[sig-composition-environments-slack]: https://crossplane.slack.com/archives/C05BP6QFLUW
-[sig-composition-functions-slack]: https://crossplane.slack.com/archives/C031Y29CSAE
-[sig-deletion-ordering-slack]: https://crossplane.slack.com/archives/C05BP8W5ALW
-[sig-devex-slack]: https://crossplane.slack.com/archives/C05U1LLM3B2
-[sig-e2e-testing-slack]: https://crossplane.slack.com/archives/C05C8CCTVNV
-[sig-observability-slack]: https://crossplane.slack.com/archives/C061GNH3LA0
-[sig-observe-only-slack]: https://crossplane.slack.com/archives/C04D5988QEA
-[sig-provider-families-slack]: https://crossplane.slack.com/archives/C056YAQRV16
-[sig-secret-stores-slack]: https://crossplane.slack.com/archives/C05BY7DKFV2
-[sig-upjet-provider-efficiency-slack]: https://crossplane.slack.com/archives/C04QLETDJGN
+[Universal Crossplane]: https://www.upbound.io/uxp
+[Universal Crossplane Github Repo]: https://github.com/upbound/universal-crossplane
+[documentation]: https://cloud.upbound.io/docs/uxp

cluster/charts/crossplane/values.yaml

@@ -9,7 +9,7 @@ deploymentStrategy: RollingUpdate
 
 image:
   # -- Repository for the Crossplane pod image.
-  repository: xpkg.upbound.io/crossplane/crossplane
+  repository: xpkg.upbound.io/upbound/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.

cluster/local/kind.sh

@@ -43,7 +43,7 @@ function check_context() {
 
 # configure kind
 KIND_NAME=${KIND_NAME:-"kind"}
-IMAGE_REPOSITORY="xpkg.upbound.io/${PROJECT_NAME}/${PROJECT_NAME}"
+IMAGE_REPOSITORY="xpkg.upbound.io/upbound/${PROJECT_NAME}"
 case "${1:-}" in
   up)
     ${KIND} create cluster --name "${KIND_NAME}" --image "${KUBE_IMAGE}" --wait 5m

cmd/crossplane/core/core.go

@@ -112,6 +112,13 @@ type startCommand struct {
 	EnableExternalSecretStores bool `group:"Alpha Features:" help:"Enable support for External Secret Stores."`
 	EnableUsages               bool `group:"Alpha Features:" help:"Enable support for deletion ordering and resource protection with Usages."`
 	EnableRealtimeCompositions bool `group:"Alpha Features:" help:"Enable support for realtime compositions, i.e. watching composed resources and reconciling compositions immediately when any of the composed resources is updated."`
+	// NOTE(hasheddan): this feature is unlikely to graduate from alpha status
+	// and should be removed when a runtime interface is introduced upstream.
+	// See https://github.com/crossplane/crossplane/issues/2671 for more
+	// information.
+	// TODO(turkenh): Consider removing this feature flag in favor of providing
+	//  a default DeploymentRuntimeConfig.
+	EnableProviderIdentity bool `group:"Alpha Features:" help:"Enable support for Provider identity."`
 
 	EnableCompositionFunctions               bool `group:"Beta Features:" default:"true" help:"Enable support for Composition Functions."`
 	EnableCompositionWebhookSchemaValidation bool `group:"Beta Features:" default:"true" help:"Enable support for Composition validation using schemas."`
@@ -218,6 +225,11 @@ func (c *startCommand) Run(s *runtime.Scheme, log logging.Logger) error { //noli
 		Features:                &feature.Flags{},
 	}
 
+	if c.EnableProviderIdentity {
+		o.Features.Enable(features.EnableProviderIdentity)
+		log.Info("Alpha feature enabled", "flag", features.EnableProviderIdentity)
+	}
+
 	if !c.EnableCompositionRevisions {
 		log.Info("CompositionRevisions feature is GA and cannot be disabled. The --enable-composition-revisions flag will be removed in a future release.")
 	}

go.mod

@@ -108,7 +108,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
-	github.com/aws/smithy-go v1.13.5 // indirect
+	github.com/aws/smithy-go v1.13.5
 	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20230510185313-f5e39e5f34c7 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bufbuild/protocompile v0.6.0 // indirect