Skip to content

Commit

Permalink
Merge pull request #441 from ezgidemirel/sync-release-1-15
Browse files Browse the repository at this point in the history
Sync release-1.15 branch
  • Loading branch information
ezgidemirel committed Feb 29, 2024
2 parents def7dfc + 0f4f0db commit a979a47
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ EKS_ADDON_REGISTRY := 709825985650.dkr.ecr.us-east-1.amazonaws.com
CROSSPLANE_REPO := https://github.com/upbound/crossplane.git
# Tag corresponds to Docker image tag while commit is git-compatible signature
# for pulling. They do not always match.
CROSSPLANE_TAG := v1.15.0-up.1.rc.3
CROSSPLANE_COMMIT := v1.15.0-up.1.rc.3
CROSSPLANE_TAG := v1.15.0-up.1
CROSSPLANE_COMMIT := v1.15.0-up.1

BOOTSTRAPPER_TAG := $(VERSION)

Expand Down
2 changes: 1 addition & 1 deletion cluster/charts/universal-crossplane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ planes.
| hostNetwork | bool | `false` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. |
| image.pullPolicy | string | `"IfNotPresent"` | The image pull policy used for Crossplane and RBAC Manager pods. |
| image.repository | string | `"xpkg.upbound.io/upbound/crossplane"` | Repository for the Crossplane pod image. |
| image.tag | string | `"v1.15.0-up.1.rc.3"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. |
| image.tag | string | `"v1.15.0-up.1"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. |
| imagePullSecrets | object | `{}` | The imagePullSecret names to add to the Crossplane ServiceAccount. |
| leaderElection | bool | `true` | Enable [leader election](https://docs.crossplane.io/latest/concepts/pods/#leader-election) for the Crossplane pod. |
| metrics.enabled | bool | `false` | Enable Prometheus path, port and scrape annotations and expose port 8080 for both the Crossplane and RBAC Manager pods. |
Expand Down
2 changes: 1 addition & 1 deletion cluster/charts/universal-crossplane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
# -- Repository for the Crossplane pod image.
repository: xpkg.upbound.io/upbound/crossplane
# -- The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`.
tag: "v1.15.0-up.1.rc.3"
tag: "v1.15.0-up.1"
# -- The image pull policy used for Crossplane and RBAC Manager pods.
pullPolicy: IfNotPresent

Expand Down

0 comments on commit a979a47

Please sign in to comment.