Merge pull request #415 from upbound/backport-414-to-release-1.14

[Backport release-1.14] Bump u xp 1.14.4
upbound · Dec 13, 2023 · b0e94e2 · b0e94e2
2 parents b04be09 + 4aece17
commit b0e94e2
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 22 deletions.
diff --git 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
@@ -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/...r/charts/universal-crossplane/templates/crossplane/rbac-manager-managed-clusterroles.yaml b/...r/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/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
 

diff --git 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
@@ -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
@@ -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/...ts/compositeresourcedefinitions.apiextensions.crossplane.io.customresourcedefinition.yaml b/...ts/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/<group>/<version>/...` if `served` is true.

diff --git a/.../manifests/compositionrevisions.apiextensions.crossplane.io.customresourcedefinition.yaml b/.../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/...m/bundle/manifests/compositions.apiextensions.crossplane.io.customresourcedefinition.yaml b/...m/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
@@ -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
@@ -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
@@ -41,11 +41,7 @@ rules:
 - apiGroups:
   - pkg.crossplane.io
   resources:
-  - locks
-  - providers
-  - configurations
-  - providerrevisions
-  - configurationrevisions
+  - '*'
   verbs:
   - get
   - list