diff --git a/Makefile b/Makefile index 1acc1ee..99ae15f 100644 --- a/Makefile +++ b/Makefile @@ -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 -CROSSPLANE_COMMIT := v1.15.0-up.1 +CROSSPLANE_TAG := v1.15.1-up.1 +CROSSPLANE_COMMIT := v1.15.1-up.1 BOOTSTRAPPER_TAG := $(VERSION) diff --git a/cluster/charts/universal-crossplane/README.md b/cluster/charts/universal-crossplane/README.md index aad0102..d3791ee 100644 --- a/cluster/charts/universal-crossplane/README.md +++ b/cluster/charts/universal-crossplane/README.md @@ -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"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | +| image.tag | string | `"v1.15.1-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. | @@ -69,8 +69,8 @@ planes. | registryCaBundleConfig.key | string | `""` | The ConfigMap key containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | | registryCaBundleConfig.name | string | `""` | The ConfigMap name containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates. | | replicas | int | `1` | The number of Crossplane pod `replicas` to deploy. | -| resourcesCrossplane.limits.cpu | string | `"100m"` | CPU resource limits for the Crossplane pod. | -| resourcesCrossplane.limits.memory | string | `"512Mi"` | Memory resource limits for the Crossplane pod. | +| resourcesCrossplane.limits.cpu | string | `"500m"` | CPU resource limits for the Crossplane pod. | +| resourcesCrossplane.limits.memory | string | `"1024Mi"` | Memory resource limits for the Crossplane pod. | | resourcesCrossplane.requests.cpu | string | `"100m"` | CPU resource requests for the Crossplane pod. | | resourcesCrossplane.requests.memory | string | `"256Mi"` | Memory resource requests for the Crossplane pod. | | resourcesRBACManager.limits.cpu | string | `"100m"` | CPU resource limits for the RBAC Manager pod. | diff --git a/cluster/charts/universal-crossplane/values.yaml b/cluster/charts/universal-crossplane/values.yaml index e0ab13d..93c79cc 100755 --- a/cluster/charts/universal-crossplane/values.yaml +++ b/cluster/charts/universal-crossplane/values.yaml @@ -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" + tag: "v1.15.1-up.1" # -- The image pull policy used for Crossplane and RBAC Manager pods. pullPolicy: IfNotPresent @@ -85,9 +85,9 @@ priorityClassName: "" resourcesCrossplane: limits: # -- CPU resource limits for the Crossplane pod. - cpu: 100m + cpu: 500m # -- Memory resource limits for the Crossplane pod. - memory: 512Mi + memory: 1024Mi requests: # -- CPU resource requests for the Crossplane pod. cpu: 100m diff --git a/cluster/crds/apiextensions.crossplane.io_usages.yaml b/cluster/crds/apiextensions.crossplane.io_usages.yaml index 0cd30d5..e05a9b4 100644 --- a/cluster/crds/apiextensions.crossplane.io_usages.yaml +++ b/cluster/crds/apiextensions.crossplane.io_usages.yaml @@ -138,6 +138,11 @@ spec: reason: description: Reason is the reason for blocking deletion of the resource. type: string + replayDeletion: + description: ReplayDeletion will trigger a deletion on the used resource + during the deletion of the usage itself, if it was attempted to + be deleted at least once. + type: boolean required: - of type: object diff --git a/cluster/olm/bundle/manifests/usages.apiextensions.crossplane.io.customresourcedefinition.yaml b/cluster/olm/bundle/manifests/usages.apiextensions.crossplane.io.customresourcedefinition.yaml index 254c67d..09acf57 100644 --- a/cluster/olm/bundle/manifests/usages.apiextensions.crossplane.io.customresourcedefinition.yaml +++ b/cluster/olm/bundle/manifests/usages.apiextensions.crossplane.io.customresourcedefinition.yaml @@ -134,6 +134,9 @@ spec: reason: description: Reason is the reason for blocking deletion of the resource. type: string + replayDeletion: + description: ReplayDeletion will trigger a deletion on the used resource during the deletion of the usage itself, if it was attempted to be deleted at least once. + type: boolean required: - of type: object