diff --git a/Makefile b/Makefile index 0f73810..fe11306 100644 --- 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.16.2-up.1 -CROSSPLANE_COMMIT := v1.16.2-up.1 +CROSSPLANE_TAG := v1.16.4-up.1 +CROSSPLANE_COMMIT := v1.16.4-up.1 export CROSSPLANE_TAG diff --git a/cluster/charts/universal-crossplane/README.md b/cluster/charts/universal-crossplane/README.md index 3d5d71a..4fe4826 100644 --- a/cluster/charts/universal-crossplane/README.md +++ b/cluster/charts/universal-crossplane/README.md @@ -46,7 +46,7 @@ planes. | 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.16.2-up.1"` | The Crossplane image tag. Defaults to the value of `appVersion` in `Chart.yaml`. | +| image.tag | string | `"v1.16.4-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. | diff --git a/cluster/charts/universal-crossplane/values.yaml b/cluster/charts/universal-crossplane/values.yaml index 9691ed5..3cf3e07 100755 --- 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.16.2-up.1" + tag: "v1.16.4-up.1" # -- The image pull policy used for Crossplane and RBAC Manager pods. pullPolicy: IfNotPresent diff --git a/cluster/crds/pkg.crossplane.io_imageconfigs.yaml b/cluster/crds/pkg.crossplane.io_imageconfigs.yaml new file mode 100644 index 0000000..15930bf --- /dev/null +++ b/cluster/crds/pkg.crossplane.io_imageconfigs.yaml @@ -0,0 +1,100 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.14.0 + name: imageconfigs.pkg.crossplane.io +spec: + group: pkg.crossplane.io + names: + categories: + - crossplane + kind: ImageConfig + listKind: ImageConfigList + plural: imageconfigs + singular: imageconfig + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: The ImageConfig resource is used to configure settings for package + images. + properties: + apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources + type: string + kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds + type: string + metadata: + type: object + spec: + description: ImageConfigSpec contains the configuration for matching images. + properties: + matchImages: + description: MatchImages is a list of image matching rules that should + be satisfied. + items: + description: ImageMatch defines a rule for matching image. + properties: + prefix: + description: Prefix is the prefix that should be matched. + type: string + type: + default: Prefix + description: Type is the type of match. + enum: + - Prefix + type: string + required: + - prefix + type: object + type: array + x-kubernetes-validations: + - message: matchImages should have at least one element. + rule: size(self) > 0 + registry: + description: Registry is the configuration for the registry. + properties: + authentication: + description: Authentication is the authentication information + for the registry. + properties: + pullSecretRef: + description: |- + PullSecretRef is a reference to a secret that contains the credentials for + the registry. + properties: + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + type: object + x-kubernetes-map-type: atomic + required: + - pullSecretRef + type: object + type: object + required: + - matchImages + type: object + type: object + served: true + storage: true + subresources: {} diff --git a/cluster/olm/bundle/manifests/imageconfigs.pkg.crossplane.io.customresourcedefinition.yaml b/cluster/olm/bundle/manifests/imageconfigs.pkg.crossplane.io.customresourcedefinition.yaml new file mode 100644 index 0000000..6109498 --- /dev/null +++ b/cluster/olm/bundle/manifests/imageconfigs.pkg.crossplane.io.customresourcedefinition.yaml @@ -0,0 +1,98 @@ +# Generated by https://github.com/upbound/olm-bundle +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.14.0 + name: imageconfigs.pkg.crossplane.io +spec: + group: pkg.crossplane.io + names: + categories: + - crossplane + kind: ImageConfig + listKind: ImageConfigList + plural: imageconfigs + singular: imageconfig + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: The ImageConfig resource is used to configure settings for package images. + properties: + apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources + type: string + kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds + type: string + metadata: + type: object + spec: + description: ImageConfigSpec contains the configuration for matching images. + properties: + matchImages: + description: MatchImages is a list of image matching rules that should be satisfied. + items: + description: ImageMatch defines a rule for matching image. + properties: + prefix: + description: Prefix is the prefix that should be matched. + type: string + type: + default: Prefix + description: Type is the type of match. + enum: + - Prefix + type: string + required: + - prefix + type: object + type: array + x-kubernetes-validations: + - message: matchImages should have at least one element. + rule: size(self) > 0 + registry: + description: Registry is the configuration for the registry. + properties: + authentication: + description: Authentication is the authentication information for the registry. + properties: + pullSecretRef: + description: |- + PullSecretRef is a reference to a secret that contains the credentials for + the registry. + properties: + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + type: object + x-kubernetes-map-type: atomic + required: + - pullSecretRef + type: object + type: object + required: + - matchImages + type: object + type: object + served: true + storage: true + subresources: {}