Update Crossplane from 1.14.3 to 1.14.5 (#2)

kadras-io · Jan 10, 2024 · b648044 · b648044
1 parent f3fe7ee
commit b648044
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,6 +18,6 @@ jobs:
       registry-server: ghcr.io
       registry-username: ${{ github.actor }}
       image: ${{ github.repository }}
-      version: 1.14.3
+      version: 1.14.5
     secrets:
       pull-request-token: ${{ secrets.GH_ORG_PAT }}
diff --git a/...el/upstream/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml b/...el/upstream/crossplane/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/...fig/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_compositionrevisions.yaml b/...fig/carvel/upstream/crossplane/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/package/config/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_compositions.yaml b/package/config/carvel/upstream/crossplane/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/package/config/helm/upstream/crossplane/Chart.yaml b/package/config/helm/upstream/crossplane/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.14.3
+appVersion: 1.14.5
 description: Crossplane is an open source Kubernetes add-on that enables platform
   teams to assemble infrastructure from multiple vendors, and expose higher level
   self-service APIs for application teams to consume.
@@ -32,4 +32,4 @@ maintainers:
 - email: [email protected]
   name: Crossplane Maintainers
 name: crossplane
-version: 1.14.3
+version: 1.14.5
diff --git a/package/config/helm/upstream/crossplane/templates/rbac-manager-managed-clusterroles.yaml b/package/config/helm/upstream/crossplane/templates/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/package/vendir.lock.yml b/package/vendir.lock.yml
@@ -2,16 +2,16 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - helmChart:
-      appVersion: 1.14.3
-      version: 1.14.3
+      appVersion: 1.14.5
+      version: 1.14.5
     path: crossplane
   path: config/helm/upstream
 - contents:
   - git:
-      commitTitle: 'Merge pull request #5054 from crossplane/backport-5051-to-release-1.14...'
-      sha: bf5c51e6dfdde4c45a0d50c31c23147f5050e9dd
+      commitTitle: 'Merge pull request #5169 from crossplane/backport-5165-to-release-1.14...'
+      sha: e4a418081e6fec505fe47b6e7c20ac689faa973e
       tags:
-      - v1.14.3
+      - v1.14.5
     path: crossplane
   path: config/carvel/upstream
 kind: LockConfig
diff --git a/package/vendir.yml b/package/vendir.yml
@@ -5,14 +5,14 @@ directories:
       name: crossplane
       repository:
         url: https://charts.crossplane.io/stable
-      version: 1.14.3
+      version: 1.14.5
     path: crossplane
   path: config/helm/upstream
 - contents:
   # The Crossplane Helm chart doesn't include CRDs, which are created at runtime.
   # We fetch them explicitly to make it possible to instantiate CR as part of this package. 
   - git:
-      ref: v1.14.3
+      ref: v1.14.5
       url: https://github.com/crossplane/crossplane
     includePaths:
     - cluster/crds/*.yaml