From 99b4883df841263f55571719a2f1d5d452d8e74d Mon Sep 17 00:00:00 2001 From: lsviben Date: Wed, 13 Dec 2023 12:39:04 +0100 Subject: [PATCH 1/2] bump xp to 1.14.4-up.1 Signed-off-by: lsviben (cherry picked from commit e5ba861c50a32b0f3c2dfce1223d3bf56fe9dfa6) --- Makefile | 4 ++-- cluster/charts/universal-crossplane/README.md | 2 +- cluster/charts/universal-crossplane/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index aca1c91b..94124f64 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.14.3-up.1 -CROSSPLANE_COMMIT := v1.14.3-up.1 +CROSSPLANE_TAG := v1.14.4-up.1 +CROSSPLANE_COMMIT := v1.14.4-up.1 BOOTSTRAPPER_TAG := $(VERSION) diff --git a/cluster/charts/universal-crossplane/README.md b/cluster/charts/universal-crossplane/README.md index 0c1ea792..46441988 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.14.3-up.1"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | +| image.tag | string | `"v1.14.4-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. | diff --git a/cluster/charts/universal-crossplane/values.yaml b/cluster/charts/universal-crossplane/values.yaml index 81c93f45..8144b529 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.14.3-up.1" + tag: "v1.14.4-up.1" # -- The image pull policy used for Crossplane and RBAC Manager pods. pullPolicy: IfNotPresent From 4aece1714f2003fc9a2c50abfb3f1843680dc25d Mon Sep 17 00:00:00 2001 From: lsviben Date: Wed, 13 Dec 2023 13:06:28 +0100 Subject: [PATCH 2/2] run make generate Signed-off-by: lsviben (cherry picked from commit 15b833d8e771e7fa6821cf4eebf54ea944014fca) --- .../crossplane/rbac-manager-managed-clusterroles.yaml | 6 +++--- ...ons.crossplane.io_compositeresourcedefinitions.yaml | 1 + ...iextensions.crossplane.io_compositionrevisions.yaml | 10 ++++++++++ .../crds/apiextensions.crossplane.io_compositions.yaml | 5 +++++ ...ensions.crossplane.io.customresourcedefinition.yaml | 1 + ...ensions.crossplane.io.customresourcedefinition.yaml | 8 ++++++++ ...ensions.crossplane.io.customresourcedefinition.yaml | 4 ++++ .../crossplane_aggregate-to-admin.clusterrole.yaml | 6 +----- .../crossplane_aggregate-to-edit.clusterrole.yaml | 6 +----- .../crossplane_aggregate-to-view.clusterrole.yaml | 6 +----- 10 files changed, 35 insertions(+), 18 deletions(-) diff --git a/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-managed-clusterroles.yaml b/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-managed-clusterroles.yaml index 3494b09b..1354396f 100644 --- a/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-managed-clusterroles.yaml +++ b/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-managed-clusterroles.yaml @@ -101,7 +101,7 @@ rules: verbs: ["*"] - apiGroups: - pkg.crossplane.io - resources: [locks, providers, configurations, providerrevisions, configurationrevisions] + resources: ["*"] verbs: ["*"] # Crossplane administrators have access to view CRDs in order to debug XRDs. - apiGroups: [apiextensions.k8s.io] @@ -137,7 +137,7 @@ rules: verbs: ["*"] - apiGroups: - pkg.crossplane.io - resources: [locks, providers, configurations, providerrevisions, configurationrevisions] + resources: ["*"] verbs: ["*"] --- apiVersion: rbac.authorization.k8s.io/v1 @@ -164,7 +164,7 @@ rules: verbs: [get, list, watch] - apiGroups: - pkg.crossplane.io - resources: [locks, providers, configurations, providerrevisions, configurationrevisions] + resources: ["*"] verbs: [get, list, watch] --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml b/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml index 81f9ffdd..7ce85e29 100644 --- a/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml +++ b/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml @@ -384,6 +384,7 @@ spec: deprecationWarning: description: DeprecationWarning specifies the message that should be shown to the user when using this version. + maxLength: 256 type: string name: description: Name of this version, e.g. “v1”, “v2beta1”, etc. diff --git a/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml b/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml index 211866ac..9ef7b4a7 100644 --- a/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml +++ b/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml @@ -158,6 +158,11 @@ spec: if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum + of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" @@ -1612,6 +1617,11 @@ spec: if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum + of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" diff --git a/cluster/crds/apiextensions.crossplane.io_compositions.yaml b/cluster/crds/apiextensions.crossplane.io_compositions.yaml index ea233a10..cbcddad8 100644 --- a/cluster/crds/apiextensions.crossplane.io_compositions.yaml +++ b/cluster/crds/apiextensions.crossplane.io_compositions.yaml @@ -153,6 +153,11 @@ spec: if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum + of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" diff --git a/cluster/olm/bundle/manifests/compositeresourcedefinitions.apiextensions.crossplane.io.customresourcedefinition.yaml b/cluster/olm/bundle/manifests/compositeresourcedefinitions.apiextensions.crossplane.io.customresourcedefinition.yaml index d98d318f..9dad9a9d 100644 --- a/cluster/olm/bundle/manifests/compositeresourcedefinitions.apiextensions.crossplane.io.customresourcedefinition.yaml +++ b/cluster/olm/bundle/manifests/compositeresourcedefinitions.apiextensions.crossplane.io.customresourcedefinition.yaml @@ -248,6 +248,7 @@ spec: type: boolean deprecationWarning: description: DeprecationWarning specifies the message that should be shown to the user when using this version. + maxLength: 256 type: string name: description: Name of this version, e.g. “v1”, “v2beta1”, etc. Composite resources are served under this version at `/apis///...` if `served` is true. diff --git a/cluster/olm/bundle/manifests/compositionrevisions.apiextensions.crossplane.io.customresourcedefinition.yaml b/cluster/olm/bundle/manifests/compositionrevisions.apiextensions.crossplane.io.customresourcedefinition.yaml index 6e4d89c6..a100e8fd 100644 --- a/cluster/olm/bundle/manifests/compositionrevisions.apiextensions.crossplane.io.customresourcedefinition.yaml +++ b/cluster/olm/bundle/manifests/compositionrevisions.apiextensions.crossplane.io.customresourcedefinition.yaml @@ -121,6 +121,10 @@ spec: description: MaxMatch specifies the number of extracted EnvironmentConfigs in Multiple mode, extracts all if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" or "Multiple".' @@ -1174,6 +1178,10 @@ spec: description: MaxMatch specifies the number of extracted EnvironmentConfigs in Multiple mode, extracts all if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" or "Multiple".' diff --git a/cluster/olm/bundle/manifests/compositions.apiextensions.crossplane.io.customresourcedefinition.yaml b/cluster/olm/bundle/manifests/compositions.apiextensions.crossplane.io.customresourcedefinition.yaml index 433a9132..2dc3775d 100644 --- a/cluster/olm/bundle/manifests/compositions.apiextensions.crossplane.io.customresourcedefinition.yaml +++ b/cluster/olm/bundle/manifests/compositions.apiextensions.crossplane.io.customresourcedefinition.yaml @@ -118,6 +118,10 @@ spec: description: MaxMatch specifies the number of extracted EnvironmentConfigs in Multiple mode, extracts all if nil. format: int64 type: integer + minMatch: + description: MinMatch specifies the required minimum of extracted EnvironmentConfigs in Multiple mode. + format: int64 + type: integer mode: default: Single description: 'Mode specifies retrieval strategy: "Single" or "Multiple".' diff --git a/cluster/olm/bundle/manifests/crossplane_aggregate-to-admin.clusterrole.yaml b/cluster/olm/bundle/manifests/crossplane_aggregate-to-admin.clusterrole.yaml index 46d8e254..7c39b4f2 100644 --- a/cluster/olm/bundle/manifests/crossplane_aggregate-to-admin.clusterrole.yaml +++ b/cluster/olm/bundle/manifests/crossplane_aggregate-to-admin.clusterrole.yaml @@ -54,11 +54,7 @@ rules: - apiGroups: - pkg.crossplane.io resources: - - locks - - providers - - configurations - - providerrevisions - - configurationrevisions + - '*' verbs: - '*' - apiGroups: diff --git a/cluster/olm/bundle/manifests/crossplane_aggregate-to-edit.clusterrole.yaml b/cluster/olm/bundle/manifests/crossplane_aggregate-to-edit.clusterrole.yaml index 629f4231..8c740e59 100644 --- a/cluster/olm/bundle/manifests/crossplane_aggregate-to-edit.clusterrole.yaml +++ b/cluster/olm/bundle/manifests/crossplane_aggregate-to-edit.clusterrole.yaml @@ -45,10 +45,6 @@ rules: - apiGroups: - pkg.crossplane.io resources: - - locks - - providers - - configurations - - providerrevisions - - configurationrevisions + - '*' verbs: - '*' diff --git a/cluster/olm/bundle/manifests/crossplane_aggregate-to-view.clusterrole.yaml b/cluster/olm/bundle/manifests/crossplane_aggregate-to-view.clusterrole.yaml index ec33291f..57e218c6 100644 --- a/cluster/olm/bundle/manifests/crossplane_aggregate-to-view.clusterrole.yaml +++ b/cluster/olm/bundle/manifests/crossplane_aggregate-to-view.clusterrole.yaml @@ -41,11 +41,7 @@ rules: - apiGroups: - pkg.crossplane.io resources: - - locks - - providers - - configurations - - providerrevisions - - configurationrevisions + - '*' verbs: - get - list