Skip to content

Commit 1ea61d1

Browse files
ThomasVitaleThomasVitale
authored
Update to Crossplane 1.16.0 (#5)
Signed-off-by: Thomas Vitale <[email protected]>
1 parent b3c79f1 commit 1ea61d1

33 files changed

+410
-90
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
registry-server: ghcr.io
1919
registry-username: ${{ github.actor }}
2020
image: ${{ github.repository }}
21-
version: 1.15.0+kadras.2
21+
version: 1.16.0
2222
secrets:
2323
pull-request-token: ${{ secrets.GH_ORG_PAT }}

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Integration Tests
1515
strategy:
1616
matrix:
17-
k8s_version: [v1.27, v1.28, v1.29]
17+
k8s_version: [v1.28, v1.29, v1.30]
1818
permissions:
1919
contents: read
2020
uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
K8S_VERSION=v1.29
1+
K8S_VERSION=v1.30
22

33
# Build package configuration
44
build: package

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ A Carvel package for [Crossplane](https://crossplane.io), a Kubernetes extension
1212

1313
### Prerequisites
1414

15-
* Kubernetes 1.27+
15+
* Kubernetes 1.28+
1616
* Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI.
1717
* Carvel [kapp-controller](https://carvel.dev/kapp-controller) deployed in your Kubernetes cluster. You can install it with Carvel [`kapp`](https://carvel.dev/kapp/docs/latest/install) (recommended choice) or `kubectl`.
1818

‎package/config/carvel/functions/patch-and-transform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: Function
44
metadata:
55
name: function-patch-and-transform
66
spec:
7-
package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.3.0
7+
package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.5.0

‎package/config/carvel/providers/provider-kubernetes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ kind: Provider
1414
metadata:
1515
name: provider-kubernetes
1616
spec:
17-
package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.12.1
17+
package: xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.13.0
1818
runtimeConfigRef:
1919
name: provider-kubernetes-runtime-config

‎package/config/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ spec:
3232
schema:
3333
openAPIV3Schema:
3434
description: |-
35-
A CompositeResourceDefinition defines a new kind of composite infrastructure
36-
resource. The new resource is composed of other composite or managed
37-
infrastructure resources.
35+
A CompositeResourceDefinition defines the schema for a new custom Kubernetes
36+
API.
37+
38+
39+
Read the Crossplane documentation for
40+
[more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
3841
properties:
3942
apiVersion:
4043
description: |-
@@ -480,6 +483,13 @@ spec:
480483
A Message containing details about this condition's last transition from
481484
one status to another, if any.
482485
type: string
486+
observedGeneration:
487+
description: |-
488+
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
489+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
490+
with respect to the current state of the instance.
491+
format: int64
492+
type: integer
483493
reason:
484494
description: A Reason for this condition's last transition from
485495
one status to another.

‎package/config/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_compositionrevisions.yaml

Lines changed: 126 additions & 12 deletions
Large diffs are not rendered by default.

‎package/config/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_compositions.yaml

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ spec:
3030
name: v1
3131
schema:
3232
openAPIV3Schema:
33-
description: A Composition specifies how a composite resource should be composed.
33+
description: |-
34+
A Composition defines a collection of managed resources or functions that
35+
Crossplane uses to create and manage new composite resources.
36+
37+
38+
Read the Crossplane documentation for
39+
[more information about Compositions](https://docs.crossplane.io/latest/concepts/compositions).
3440
properties:
3541
apiVersion:
3642
description: |-
@@ -276,7 +282,7 @@ spec:
276282
type: string
277283
mergeOptions:
278284
description: MergeOptions Specifies merge options on
279-
a field path
285+
a field path.
280286
properties:
281287
appendSlice:
282288
description: Specifies that already existing elements
@@ -451,6 +457,7 @@ spec:
451457
`ToJson` converts any input value into its raw JSON representation.
452458
`ToSha1`, `ToSha256` and `ToSha512` generate a hash value based on the input
453459
converted to JSON.
460+
`ToAdler32` generate a addler32 hash based on the input string.
454461
enum:
455462
- ToUpper
456463
- ToLower
@@ -460,6 +467,7 @@ spec:
460467
- ToSha1
461468
- ToSha256
462469
- ToSha512
470+
- ToAdler32
463471
type: string
464472
fmt:
465473
description: |-
@@ -688,7 +696,7 @@ spec:
688696
type: string
689697
mergeOptions:
690698
description: MergeOptions Specifies merge options
691-
on a field path
699+
on a field path.
692700
properties:
693701
appendSlice:
694702
description: Specifies that already existing elements
@@ -864,6 +872,7 @@ spec:
864872
`ToJson` converts any input value into its raw JSON representation.
865873
`ToSha1`, `ToSha256` and `ToSha512` generate a hash value based on the input
866874
converted to JSON.
875+
`ToAdler32` generate a addler32 hash based on the input string.
867876
enum:
868877
- ToUpper
869878
- ToLower
@@ -873,6 +882,7 @@ spec:
873882
- ToSha1
874883
- ToSha256
875884
- ToSha512
885+
- ToAdler32
876886
type: string
877887
fmt:
878888
description: |-
@@ -976,6 +986,46 @@ spec:
976986
items:
977987
description: A PipelineStep in a Composition Function pipeline.
978988
properties:
989+
credentials:
990+
description: Credentials are optional credentials that the Composition
991+
Function needs.
992+
items:
993+
description: |-
994+
FunctionCredentials are optional credentials that a Composition Function
995+
needs to run.
996+
properties:
997+
name:
998+
description: Name of this set of credentials.
999+
type: string
1000+
secretRef:
1001+
description: |-
1002+
A SecretRef is a reference to a secret containing credentials that should
1003+
be supplied to the function.
1004+
properties:
1005+
name:
1006+
description: Name of the secret.
1007+
type: string
1008+
namespace:
1009+
description: Namespace of the secret.
1010+
type: string
1011+
required:
1012+
- name
1013+
- namespace
1014+
type: object
1015+
source:
1016+
description: Source of the function credentials.
1017+
enum:
1018+
- None
1019+
- Secret
1020+
type: string
1021+
required:
1022+
- name
1023+
- source
1024+
type: object
1025+
type: array
1026+
x-kubernetes-list-map-keys:
1027+
- name
1028+
x-kubernetes-list-type: map
9791029
functionRef:
9801030
description: |-
9811031
FunctionRef is a reference to the Composition Function this step should
@@ -1003,6 +1053,9 @@ spec:
10031053
- step
10041054
type: object
10051055
type: array
1056+
x-kubernetes-list-map-keys:
1057+
- step
1058+
x-kubernetes-list-type: map
10061059
publishConnectionDetailsWithStoreConfigRef:
10071060
default:
10081061
name: default
@@ -1184,7 +1237,7 @@ spec:
11841237
type: string
11851238
mergeOptions:
11861239
description: MergeOptions Specifies merge options
1187-
on a field path
1240+
on a field path.
11881241
properties:
11891242
appendSlice:
11901243
description: Specifies that already existing elements
@@ -1360,6 +1413,7 @@ spec:
13601413
`ToJson` converts any input value into its raw JSON representation.
13611414
`ToSha1`, `ToSha256` and `ToSha512` generate a hash value based on the input
13621415
converted to JSON.
1416+
`ToAdler32` generate a addler32 hash based on the input string.
13631417
enum:
13641418
- ToUpper
13651419
- ToLower
@@ -1369,6 +1423,7 @@ spec:
13691423
- ToSha1
13701424
- ToSha256
13711425
- ToSha512
1426+
- ToAdler32
13721427
type: string
13731428
fmt:
13741429
description: |-
@@ -1464,7 +1519,7 @@ spec:
14641519
items:
14651520
description: |-
14661521
ReadinessCheck is used to indicate how to tell whether a resource is ready
1467-
for consumption
1522+
for consumption.
14681523
properties:
14691524
fieldPath:
14701525
description: FieldPath shows the path of the field whose

‎package/config/carvel/upstream/crossplane/crds/apiextensions.crossplane.io_environmentconfigs.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,13 @@ spec:
2424
name: v1alpha1
2525
schema:
2626
openAPIV3Schema:
27-
description: A EnvironmentConfig contains a set of arbitrary, unstructured
28-
values.
27+
description: |-
28+
An EnvironmentConfig contains user-defined unstructured values for
29+
use in a Composition.
30+
31+
32+
Read the Crossplane documentation for
33+
[more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).
2934
properties:
3035
apiVersion:
3136
description: |-

0 commit comments

Comments
 (0)