Skip to content

Commit

Permalink
Merge pull request #398 from turkenh/bump-upbound-xp
Browse files Browse the repository at this point in the history 
Bump Upbound Crossplane to v1.13.2-up.2
  • Loading branch information
@turkenh
turkenh authored Sep 13, 2023
2 parents 2dd671e + 2b566f9 commit 4ff477a
Show file tree
Hide file tree
Showing 9 changed files with 442 additions and 33 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.2-up.1
CROSSPLANE_COMMIT := v1.13.2-up.1
CROSSPLANE_TAG := v1.13.2-up.2
CROSSPLANE_COMMIT := v1.13.2-up.2

BOOTSTRAPPER_TAG := $(VERSION)

Expand Down
4 changes: 2 additions & 2 deletions cluster/charts/universal-crossplane/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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 | `"upbound/crossplane"` | Repository for the Crossplane pod image. |
| image.tag | string | `"v1.13.2-up.1"` | The Crossplane image tag. Defaults to the value of `appVersion` in Chart.yaml. |
| image.tag | string | `"v1.13.2-up.2"` | 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. |
Expand Down Expand Up @@ -97,7 +97,7 @@ planes.
| xfn.extraEnvVars | object | `{}` | Add custom environmental variables to the Composite function runner container. Replaces any `.` in a variable name with `_`. For example, `SAMPLE.KEY=value1` becomes `SAMPLE_KEY=value1`. |
| xfn.image.pullPolicy | string | `"IfNotPresent"` | Composite function runner container image pull policy. |
| xfn.image.repository | string | `"upbound/xfn"` | Composite function runner container image. |
| xfn.image.tag | string | `"v1.13.2-up.1"` | Composite function runner container image tag. Defaults to the value of `appVersion` in Chart.yaml. |
| xfn.image.tag | string | `"v1.13.2-up.2"` | Composite function runner container image tag. Defaults to the value of `appVersion` in Chart.yaml. |
| xfn.resources.limits.cpu | string | `"2000m"` | CPU resource limits for the Composite function runner container. |
| xfn.resources.limits.memory | string | `"2Gi"` | Memory resource limits for the Composite function runner container. |
| xfn.resources.requests.cpu | string | `"1000m"` | CPU resource requests for the Composite function runner container. |
Expand Down
4 changes: 2 additions & 2 deletions cluster/charts/universal-crossplane/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
# -- Repository for the Crossplane pod image.
repository: upbound/crossplane
# -- The Crossplane image tag. Defaults to the value of `appVersion` in Chart.yaml.
tag: "v1.13.2-up.1"
tag: "v1.13.2-up.2"
# -- The image pull policy used for Crossplane and RBAC Manager pods.
pullPolicy: IfNotPresent

Expand Down Expand Up @@ -173,7 +173,7 @@ xfn:
# -- Composite function runner container image.
repository: upbound/xfn
# -- Composite function runner container image tag. Defaults to the value of `appVersion` in Chart.yaml.
tag: "v1.13.2-up.1"
tag: "v1.13.2-up.2"
# -- Composite function runner container image pull policy.
pullPolicy: IfNotPresent
# -- Add custom arguments to the Composite functions runner container.
Expand Down
54 changes: 42 additions & 12 deletions cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,14 @@ spec:
description: "The expected input format. \n *
`quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property is
null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -279,6 +282,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -748,11 +753,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -763,6 +771,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -1163,11 +1173,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -1178,6 +1191,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -1742,11 +1757,14 @@ spec:
description: "The expected input format. \n *
`quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property is
null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -1757,6 +1775,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -2226,11 +2246,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -2241,6 +2264,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -2641,11 +2666,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -2656,6 +2684,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down
27 changes: 21 additions & 6 deletions cluster/crds/apiextensions.crossplane.io_compositions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,14 @@ spec:
description: "The expected input format. \n *
`quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property is
null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -276,6 +279,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -748,11 +753,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -763,6 +771,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down Expand Up @@ -1167,11 +1177,14 @@ spec:
description: "The expected input format. \n
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
Only used during `string -> float64` conversions.
\n If this property is null, the default conversion
is applied."
* `json` - parses the input as a JSON string.
Only used during `string -> object` or `string
-> list` conversions. \n If this property
is null, the default conversion is applied."
enum:
- none
- quantity
- json
type: string
toType:
description: ToType is the type of the output
Expand All @@ -1182,6 +1195,8 @@ spec:
- int64
- bool
- float64
- object
- list
type: string
required:
- toType
Expand Down
Loading

0 comments on commit 4ff477a

Please sign in to comment.