Skip to content

Commit

Permalink
Merge pull request #381 from upbound/backport-378-to-release-1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
phisco authored Jun 9, 2023
2 parents 5feafde + d8c91c2 commit e890488
Show file tree
Hide file tree
Showing 5 changed files with 2,557 additions and 9 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.12.1-up.2
CROSSPLANE_COMMIT := v1.12.1-up.2
CROSSPLANE_TAG := v1.12.2-up.1
CROSSPLANE_COMMIT := v1.12.2-up.1

BOOTSTRAPPER_TAG := $(VERSION)

Expand Down
4 changes: 2 additions & 2 deletions cluster/charts/universal-crossplane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ planes.
| hostNetwork | bool | `false` | Enable hostNetwork for Crossplane. Caution: setting it to true means Crossplane's Pod will have high privileges. |
| image.pullPolicy | string | `"IfNotPresent"` | Crossplane image pull policy used in all containers. |
| image.repository | string | `"upbound/crossplane"` | Crossplane image. |
| image.tag | string | `"v1.12.1-up.2"` | Crossplane image tag: if not set, appVersion field from Chart.yaml is used. |
| image.tag | string | `"v1.12.2-up.1"` | Crossplane image tag: if not set, appVersion field from Chart.yaml is used. |
| imagePullSecrets | object | `{}` | Names of image pull secrets to use. |
| leaderElection | bool | `true` | Enable leader election for Crossplane Managers pod. |
| metrics.enabled | bool | `false` | Expose Crossplane and RBAC Manager metrics endpoint. |
Expand Down Expand Up @@ -92,7 +92,7 @@ planes.
| xfn.cache | object | `{"configMap":"","medium":"","pvc":"","sizeLimit":"1Gi"}` | Cache configuration for xfn. |
| xfn.enabled | bool | `false` | Enable alpha xfn sidecar container that runs Composition Functions. Note you also need to run Crossplane with --enable-composition-functions for it to call xfn. |
| xfn.extraEnvVars | object | `{}` | List of additional environment variables for the xfn container. |
| xfn.image | object | `{"pullPolicy":"IfNotPresent","repository":"upbound/xfn","tag":"v1.12.1-up.2"}` | Image for xfn: if tag is not set appVersion field from Chart.yaml is used. |
| xfn.image | object | `{"pullPolicy":"IfNotPresent","repository":"upbound/xfn","tag":"v1.12.2-up.1"}` | Image for xfn: if tag is not set appVersion field from Chart.yaml is used. |
| xfn.resources | object | `{"limits":{"cpu":"2000m","memory":"2Gi"},"requests":{"cpu":"1000m","memory":"1Gi"}}` | Resources definition for xfn. |
| xfn.resources.limits.cpu | string | `"2000m"` | CPU resource limits for RBAC Manager. |
| xfn.resources.limits.memory | string | `"2Gi"` | Memory resource limits for RBAC Manager. |
Expand Down
4 changes: 2 additions & 2 deletions cluster/charts/universal-crossplane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ image:
# -- Crossplane image.
repository: upbound/crossplane
# -- Crossplane image tag: if not set, appVersion field from Chart.yaml is used.
tag: "v1.12.1-up.2"
tag: "v1.12.2-up.1"
# -- Crossplane image pull policy used in all containers.
pullPolicy: IfNotPresent

Expand Down Expand Up @@ -168,7 +168,7 @@ xfn:
# -- Image for xfn: if tag is not set appVersion field from Chart.yaml is used.
image:
repository: upbound/xfn
tag: "v1.12.1-up.2"
tag: "v1.12.2-up.1"
pullPolicy: IfNotPresent
# -- List of additional args for the xfn container.
args: []
Expand Down
Loading

0 comments on commit e890488

Please sign in to comment.