Merge pull request #465 from phisco/main

Bump u/xp to v1.16.0-up.1
upbound · May 29, 2024 · 7442e6f · 7442e6f
2 parents 0d988d6 + 981f8b8
commit 7442e6f
Show file tree

Hide file tree

Showing 37 changed files with 678 additions and 119 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.15.2-up.1
-CROSSPLANE_COMMIT := v1.15.2-up.1
+CROSSPLANE_TAG := v1.16.0-up.1
+CROSSPLANE_COMMIT := v1.16.0-up.1
 
 BOOTSTRAPPER_TAG := $(VERSION)
 

diff --git a/cluster/charts/universal-crossplane/README.md b/cluster/charts/universal-crossplane/README.md
@@ -42,11 +42,12 @@ planes.
 | extraObjects | list | `[]` | To add arbitrary Kubernetes Objects during a Helm Install |
 | extraVolumeMountsCrossplane | object | `{}` | Add custom `volumeMounts` to the Crossplane pod. |
 | extraVolumesCrossplane | object | `{}` | Add custom `volumes` to the Crossplane pod. |
+| function.packages | list | `[]` | A list of Function packages to install |
 | hostNetwork | bool | `false` | Enable `hostNetwork` for the Crossplane deployment. Caution: enabling `hostNetwork` grants the Crossplane Pod access to the host network namespace. Consider setting `dnsPolicy` to `ClusterFirstWithHostNet`. |
 | 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.15.2-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. |
+| image.tag | string | `"v1.16.0-up.1"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. |
+| imagePullSecrets | list | `[]` | 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. |
 | nameOverride | string | `"crossplane"` |  |
@@ -86,6 +87,7 @@ planes.
 | securityContextRBACManager.readOnlyRootFilesystem | bool | `true` | Set the RBAC Manager pod root file system as read-only. |
 | securityContextRBACManager.runAsGroup | int | `65532` | The group ID used by the RBAC Manager pod. |
 | securityContextRBACManager.runAsUser | int | `65532` | The user ID used by the RBAC Manager pod. |
+| service.customAnnotations | object | `{}` | Configure annotations on the service object. Only enabled when webhooks.enabled = true |
 | serviceAccount.customAnnotations | object | `{}` | Add custom `annotations` to the Crossplane ServiceAccount. |
 | tolerations | list | `[]` | Add `tolerations` to the Crossplane pod deployment. |
 | webhooks.enabled | bool | `true` | Enable webhooks for Crossplane and installed Provider packages. |

diff --git a/cluster/charts/universal-crossplane/templates/crossplane/deployment.yaml b/cluster/charts/universal-crossplane/templates/crossplane/deployment.yaml
@@ -59,6 +59,10 @@ spec:
           - --configuration
           - "{{ $arg }}"
           {{- end }}
+          {{- range $arg := .Values.function.packages }}
+          - --function
+          - "{{ $arg }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: {{ .Chart.Name }}-init
           resources:

diff --git a/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-deployment.yaml b/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-deployment.yaml
@@ -64,11 +64,13 @@ spec:
               resourceFieldRef:
                 containerName: {{ .Chart.Name }}-init
                 resource: limits.cpu
+                divisor: "1"
           - name: GOMEMLIMIT
             valueFrom:
               resourceFieldRef:
                 containerName: {{ .Chart.Name }}-init
                 resource: limits.memory
+                divisor: "1"
       containers:
       - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
         args:
@@ -97,11 +99,13 @@ spec:
               resourceFieldRef:
                 containerName: {{ .Chart.Name }}
                 resource: limits.cpu
+                divisor: "1"
           - name: GOMEMLIMIT
             valueFrom:
               resourceFieldRef:
                 containerName: {{ .Chart.Name }}
                 resource: limits.memory
+                divisor: "1"
           - name: LEADER_ELECTION
             value: "{{ .Values.rbacManager.leaderElection }}"
         {{- range $key, $value := .Values.extraEnvVarsRBACManager }}

diff --git a/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-serviceaccount.yaml b/cluster/charts/universal-crossplane/templates/crossplane/rbac-manager-serviceaccount.yaml
@@ -7,9 +7,9 @@ metadata:
   labels:
     app: {{ template "crossplane.name" . }}
     {{- include "crossplane.labels" . | indent 4 }}
-{{- if .Values.imagePullSecrets }}
+{{- with .Values.imagePullSecrets }}
 imagePullSecrets:
-{{- range $index, $secret := .Values.imagePullSecrets }}
+{{- range $index, $secret := . }}
 - name: {{ $secret }}
 {{- end }}
 {{- end }}

diff --git a/cluster/charts/universal-crossplane/templates/crossplane/service.yaml b/cluster/charts/universal-crossplane/templates/crossplane/service.yaml
@@ -8,6 +8,12 @@ metadata:
     app: {{ template "crossplane.name" . }}
     release: {{ .Release.Name }}
     {{- include "crossplane.labels" . | indent 4 }}
+  annotations:
+    {{- with .Values.service.customAnnotations }}
+    {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+    {{- end }}
 spec:
   selector:
     app: {{ template "crossplane.name" . }}

diff --git a/cluster/charts/universal-crossplane/templates/crossplane/serviceaccount.yaml b/cluster/charts/universal-crossplane/templates/crossplane/serviceaccount.yaml
@@ -9,9 +9,9 @@ metadata:
   {{- with .Values.serviceAccount.customAnnotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}
-{{- if .Values.imagePullSecrets }}
+{{- with .Values.imagePullSecrets }}
 imagePullSecrets:
-{{- range $index, $secret := .Values.imagePullSecrets }}
+{{- range $index, $secret := . }}
 - name: {{ $secret }}
 {{- end }}
 {{ end }}
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.15.2-up.1"
+  tag: "v1.16.0-up.1"
   # -- The image pull policy used for Crossplane and RBAC Manager pods.
   pullPolicy: IfNotPresent
 
@@ -51,15 +51,23 @@ configuration:
   # -- A list of Configuration packages to install.
   packages: []
 
+function:
+  # -- A list of Function packages to install
+  packages: []
+
 # -- The imagePullSecret names to add to the Crossplane ServiceAccount.
-imagePullSecrets: {}
+imagePullSecrets: []
 
 registryCaBundleConfig:
   # -- The ConfigMap name containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates.
   name: ""
   # -- The ConfigMap key containing a custom CA bundle to enable fetching packages from registries with unknown or untrusted certificates.
   key: ""
 
+service:
+  # -- Configure annotations on the service object. Only enabled when webhooks.enabled = true
+  customAnnotations: {}
+
 webhooks:
   # -- Enable webhooks for Crossplane and installed Provider packages.
   enabled: true

diff --git a/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml b/cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml
@@ -32,9 +32,12 @@ spec:
     schema:
       openAPIV3Schema:
         description: |-
-          A CompositeResourceDefinition defines a new kind of composite infrastructure
-          resource. The new resource is composed of other composite or managed
-          infrastructure resources.
+          A CompositeResourceDefinition defines the schema for a new custom Kubernetes
+          API.
+
+
+          Read the Crossplane documentation for
+          [more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
         properties:
           apiVersion:
             description: |-
@@ -480,6 +483,13 @@ spec:
                         A Message containing details about this condition's last transition from
                         one status to another, if any.
                       type: string
+                    observedGeneration:
+                      description: |-
+                        ObservedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      type: integer
                     reason:
                       description: A Reason for this condition's last transition from
                         one status to another.

diff --git a/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml b/cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml
@@ -34,8 +34,12 @@ spec:
     schema:
       openAPIV3Schema:
         description: |-
-          A CompositionRevision represents a revision in time of a Composition.
-          Revisions are created by Crossplane; they should be treated as immutable.
+          A CompositionRevision represents a revision of a Composition. Crossplane
+          creates new revisions when there are changes to the Composition.
+
+
+          Crossplane creates and manages CompositionRevisions. Don't directly edit
+          CompositionRevisions.
         properties:
           apiVersion:
             description: |-
@@ -283,7 +287,7 @@ spec:
                               type: string
                             mergeOptions:
                               description: MergeOptions Specifies merge options on
-                                a field path
+                                a field path.
                               properties:
                                 appendSlice:
                                   description: Specifies that already existing elements
@@ -697,7 +701,7 @@ spec:
                                 type: string
                               mergeOptions:
                                 description: MergeOptions Specifies merge options
-                                  on a field path
+                                  on a field path.
                                 properties:
                                   appendSlice:
                                     description: Specifies that already existing elements
@@ -987,6 +991,46 @@ spec:
                 items:
                   description: A PipelineStep in a Composition Function pipeline.
                   properties:
+                    credentials:
+                      description: Credentials are optional credentials that the Composition
+                        Function needs.
+                      items:
+                        description: |-
+                          FunctionCredentials are optional credentials that a Composition Function
+                          needs to run.
+                        properties:
+                          name:
+                            description: Name of this set of credentials.
+                            type: string
+                          secretRef:
+                            description: |-
+                              A SecretRef is a reference to a secret containing credentials that should
+                              be supplied to the function.
+                            properties:
+                              name:
+                                description: Name of the secret.
+                                type: string
+                              namespace:
+                                description: Namespace of the secret.
+                                type: string
+                            required:
+                            - name
+                            - namespace
+                            type: object
+                          source:
+                            description: Source of the function credentials.
+                            enum:
+                            - None
+                            - Secret
+                            type: string
+                        required:
+                        - name
+                        - source
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
                     functionRef:
                       description: |-
                         FunctionRef is a reference to the Composition Function this step should
@@ -1195,7 +1239,7 @@ spec:
                                 type: string
                               mergeOptions:
                                 description: MergeOptions Specifies merge options
-                                  on a field path
+                                  on a field path.
                                 properties:
                                   appendSlice:
                                     description: Specifies that already existing elements
@@ -1477,7 +1521,7 @@ spec:
                       items:
                         description: |-
                           ReadinessCheck is used to indicate how to tell whether a resource is ready
-                          for consumption
+                          for consumption.
                         properties:
                           fieldPath:
                             description: FieldPath shows the path of the field whose
@@ -1570,6 +1614,13 @@ spec:
                         A Message containing details about this condition's last transition from
                         one status to another, if any.
                       type: string
+                    observedGeneration:
+                      description: |-
+                        ObservedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      type: integer
                     reason:
                       description: A Reason for this condition's last transition from
                         one status to another.
@@ -1616,8 +1667,12 @@ spec:
     schema:
       openAPIV3Schema:
         description: |-
-          A CompositionRevision represents a revision in time of a Composition.
-          Revisions are created by Crossplane; they should be treated as immutable.
+          A CompositionRevision represents a revision of a Composition. Crossplane
+          creates new revisions when there are changes to the Composition.
+
+
+          Crossplane creates and manages CompositionRevisions. Don't directly edit
+          CompositionRevisions.
         properties:
           apiVersion:
             description: |-
@@ -1865,7 +1920,7 @@ spec:
                               type: string
                             mergeOptions:
                               description: MergeOptions Specifies merge options on
-                                a field path
+                                a field path.
                               properties:
                                 appendSlice:
                                   description: Specifies that already existing elements
@@ -2279,7 +2334,7 @@ spec:
                                 type: string
                               mergeOptions:
                                 description: MergeOptions Specifies merge options
-                                  on a field path
+                                  on a field path.
                                 properties:
                                   appendSlice:
                                     description: Specifies that already existing elements
@@ -2569,6 +2624,46 @@ spec:
                 items:
                   description: A PipelineStep in a Composition Function pipeline.
                   properties:
+                    credentials:
+                      description: Credentials are optional credentials that the Composition
+                        Function needs.
+                      items:
+                        description: |-
+                          FunctionCredentials are optional credentials that a Composition Function
+                          needs to run.
+                        properties:
+                          name:
+                            description: Name of this set of credentials.
+                            type: string
+                          secretRef:
+                            description: |-
+                              A SecretRef is a reference to a secret containing credentials that should
+                              be supplied to the function.
+                            properties:
+                              name:
+                                description: Name of the secret.
+                                type: string
+                              namespace:
+                                description: Namespace of the secret.
+                                type: string
+                            required:
+                            - name
+                            - namespace
+                            type: object
+                          source:
+                            description: Source of the function credentials.
+                            enum:
+                            - None
+                            - Secret
+                            type: string
+                        required:
+                        - name
+                        - source
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
                     functionRef:
                       description: |-
                         FunctionRef is a reference to the Composition Function this step should
@@ -2777,7 +2872,7 @@ spec:
                                 type: string
                               mergeOptions:
                                 description: MergeOptions Specifies merge options
-                                  on a field path
+                                  on a field path.
                                 properties:
                                   appendSlice:
                                     description: Specifies that already existing elements
@@ -3059,7 +3154,7 @@ spec:
                       items:
                         description: |-
                           ReadinessCheck is used to indicate how to tell whether a resource is ready
-                          for consumption
+                          for consumption.
                         properties:
                           fieldPath:
                             description: FieldPath shows the path of the field whose
@@ -3152,6 +3247,13 @@ spec:
                         A Message containing details about this condition's last transition from
                         one status to another, if any.
                       type: string
+                    observedGeneration:
+                      description: |-
+                        ObservedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      type: integer
                     reason:
                       description: A Reason for this condition's last transition from
                         one status to another.