From a4cd0ae7a96637e302b565e99cff9a079e278f97 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Mon, 10 May 2021 18:34:02 +0000 Subject: [PATCH] chore(deps): update flux components to v0.13.4 Signed-off-by: Devin Buhl --- cluster/flux-system/gotk-components.yaml | 166 +++++++++++++++++------ 1 file changed, 124 insertions(+), 42 deletions(-) diff --git a/cluster/flux-system/gotk-components.yaml b/cluster/flux-system/gotk-components.yaml index 52d04248ed70a..a1f386c4235b4 100755 --- a/cluster/flux-system/gotk-components.yaml +++ b/cluster/flux-system/gotk-components.yaml @@ -1,23 +1,25 @@ --- -# Flux version: v0.8.1 +# Flux version: v0.13.4 # Components: source-controller,kustomize-controller,helm-controller,notification-controller apiVersion: v1 kind: Namespace metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: flux-system --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: alerts.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -166,6 +168,10 @@ spec: - type type: object type: array + observedGeneration: + description: ObservedGeneration is the last observed generation. + format: int64 + type: integer type: object type: object served: true @@ -183,11 +189,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: buckets.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -370,11 +377,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: gitrepositories.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -382,6 +390,8 @@ spec: kind: GitRepository listKind: GitRepositoryList plural: gitrepositories + shortNames: + - gitrepo singular: gitrepository scope: Namespaced versions: @@ -427,6 +437,9 @@ spec: interval: description: The interval at which to check for repository updates. type: string + recurseSubmodules: + description: When enabled, after the clone is created, initializes all submodules within, using their default settings. This option is available only when using the 'go-git' GitImplementation. + type: boolean ref: description: The Git reference to checkout and monitor for changes, defaults to master branch. properties: @@ -585,11 +598,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: helmcharts.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -597,6 +611,8 @@ spec: kind: HelmChart listKind: HelmChartList plural: helmcharts + shortNames: + - hc singular: helmchart scope: Namespaced versions: @@ -668,8 +684,13 @@ spec: description: This flag tells the controller to suspend the reconciliation of this source. type: boolean valuesFile: - description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Ignored when omitted. + description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Deprecated in favor of ValuesFiles, for backwards compatibility the file defined here is merged before the ValuesFiles items. Ignored when omitted. type: string + valuesFiles: + description: Alternative list of values files to use as the chart values (values.yaml is not included by default), expected to be a relative path in the SourceRef. Values files are merged in the order of this list with the last file overriding the first. Ignored when omitted. + items: + type: string + type: array version: default: '*' description: The chart version semver expression, ignored for charts from GitRepository and Bucket sources. Defaults to latest when omitted. @@ -776,11 +797,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: helmreleases.helm.toolkit.fluxcd.io spec: group: helm.toolkit.fluxcd.io @@ -858,8 +880,13 @@ spec: - name type: object valuesFile: - description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Ignored when omitted. + description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Deprecated in favor of ValuesFiles, for backwards compatibility the file defined here is merged before the ValuesFiles items. Ignored when omitted. type: string + valuesFiles: + description: Alternative list of values files to use as the chart values (values.yaml is not included by default), expected to be a relative path in the SourceRef. Values files are merged in the order of this list with the last file overriding the first. Ignored when omitted. + items: + type: string + type: array version: default: '*' description: Version semver expression, ignored for charts from v1beta1.GitRepository and v1beta1.Bucket sources. Defaults to latest when omitted. @@ -889,6 +916,13 @@ spec: install: description: Install holds the configuration for Helm install actions for this HelmRelease. properties: + crds: + description: "CRDs upgrade CRDs from the Helm Chart's crds directory according to the CRD upgrade policy provided here. Valid values are `Skip`, `Create` or `CreateReplace`. Default is `Create` and if omitted CRDs are installed but not updated. \n Skip: do neither install nor replace (update) any CRDs. \n Create: new CRDs are created, existing CRDs are neither updated nor deleted. \n CreateReplace: new CRDs are created, existing CRDs are updated (replaced) but not deleted. \n By default, CRDs are applied (installed) during Helm install action. With this option users can opt-in to CRD replace existing CRDs on Helm install actions, which is not (yet) natively supported by Helm. https://helm.sh/docs/chart_best_practices/custom_resource_definitions." + enum: + - Skip + - Create + - CreateReplace + type: string createNamespace: description: CreateNamespace tells the Helm install action to create the HelmReleaseSpec.TargetNamespace if it does not exist yet. On uninstall, the namespace will not be garbage collected. type: boolean @@ -918,7 +952,7 @@ spec: description: Replace tells the Helm install action to re-use the 'ReleaseName', but only if that name is a deleted release which remains in the history. type: boolean skipCRDs: - description: SkipCRDs tells the Helm install action to not install any CRDs. By default, CRDs are installed if not already present. + description: "SkipCRDs tells the Helm install action to not install any CRDs. By default, CRDs are installed if not already present. \n Deprecated use CRD policy (`crds`) attribute with value `Skip` instead." type: boolean timeout: description: Timeout is the time to wait for any individual Kubernetes operation (like Jobs for hooks) during the performance of a Helm install action. Defaults to 'HelmReleaseSpec.Timeout'. @@ -1118,6 +1152,13 @@ spec: cleanupOnFail: description: CleanupOnFail allows deletion of new resources created during the Helm upgrade action when it fails. type: boolean + crds: + description: "CRDs upgrade CRDs from the Helm Chart's crds directory according to the CRD upgrade policy provided here. Valid values are `Skip`, `Create` or `CreateReplace`. Default is `Skip` and if omitted CRDs are neither installed nor upgraded. \n Skip: do neither install nor replace (update) any CRDs. \n Create: new CRDs are created, existing CRDs are neither updated nor deleted. \n CreateReplace: new CRDs are created, existing CRDs are updated (replaced) but not deleted. \n By default, CRDs are not applied during Helm upgrade action. With this option users can opt-in to CRD upgrade, which is not (yet) natively supported by Helm. https://helm.sh/docs/chart_best_practices/custom_resource_definitions." + enum: + - Skip + - Create + - CreateReplace + type: string disableHooks: description: DisableHooks prevents hooks from running during the Helm upgrade action. type: boolean @@ -1291,11 +1332,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: helmrepositories.source.toolkit.fluxcd.io spec: group: source.toolkit.fluxcd.io @@ -1303,6 +1345,8 @@ spec: kind: HelmRepository listKind: HelmRepositoryList plural: helmrepositories + shortNames: + - helmrepo singular: helmrepository scope: Namespaced versions: @@ -1458,11 +1502,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: kustomizations.kustomize.toolkit.fluxcd.io spec: group: kustomize.toolkit.fluxcd.io @@ -1536,6 +1581,10 @@ spec: - name type: object type: array + force: + default: false + description: Force instructs the controller to recreate resources when patching fails due to an immutable field change. + type: boolean healthChecks: description: A list of resources to be included in the health assessment. items: @@ -1736,7 +1785,7 @@ spec: description: Timeout for validation, apply and health checking operations. Defaults to 'Interval' duration. type: string validation: - description: Validate the Kubernetes objects before applying them on the cluster. The validation strategy can be 'client' (local dry-run), 'server' (APIServer dry-run) or 'none'. + description: Validate the Kubernetes objects before applying them on the cluster. The validation strategy can be 'client' (local dry-run), 'server' (APIServer dry-run) or 'none'. When 'Force' is 'true', validation will fallback to 'client' if set to 'server' because server-side validation is not supported in this scenario. enum: - none - client @@ -1850,11 +1899,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: providers.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -1895,6 +1945,15 @@ spec: description: HTTP/S webhook address of this provider pattern: ^(http|https):// type: string + certSecretRef: + description: CertSecretRef can be given the name of a secret containing a PEM-encoded CA certificate (`caFile`) + properties: + name: + description: Name of the referent + type: string + required: + - name + type: object channel: description: Alert channel for this provider type: string @@ -1923,6 +1982,9 @@ spec: - gitlab - bitbucket - azuredevops + - googlechat + - webex + - sentry type: string username: description: Bot username for this provider @@ -1993,11 +2055,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: receivers.notification.toolkit.fluxcd.io spec: group: notification.toolkit.fluxcd.io @@ -2099,6 +2162,7 @@ spec: - quay - gcr - nexus + - acr type: string required: - resources @@ -2150,6 +2214,10 @@ spec: - type type: object type: array + observedGeneration: + description: ObservedGeneration is the last observed generation. + format: int64 + type: integer url: description: Generated webhook URL in the format of '/hook/sha256sum(token+name+namespace)'. type: string @@ -2171,7 +2239,8 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: helm-controller namespace: flux-system --- @@ -2180,7 +2249,8 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: kustomize-controller namespace: flux-system --- @@ -2189,7 +2259,8 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: notification-controller namespace: flux-system --- @@ -2198,7 +2269,8 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: source-controller namespace: flux-system --- @@ -2207,7 +2279,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: crd-controller-flux-system rules: - apiGroups: @@ -2286,7 +2359,8 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: cluster-reconciler-flux-system roleRef: apiGroup: rbac.authorization.k8s.io @@ -2305,7 +2379,8 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 name: crd-controller-flux-system roleRef: apiGroup: rbac.authorization.k8s.io @@ -2336,7 +2411,8 @@ kind: Service metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: notification-controller namespace: flux-system @@ -2355,7 +2431,8 @@ kind: Service metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: source-controller namespace: flux-system @@ -2374,7 +2451,8 @@ kind: Service metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: webhook-receiver namespace: flux-system @@ -2393,7 +2471,8 @@ kind: Deployment metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: helm-controller namespace: flux-system @@ -2422,7 +2501,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/helm-controller:v0.7.0 + image: ghcr.io/fluxcd/helm-controller:v0.10.1 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -2465,7 +2544,8 @@ kind: Deployment metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: kustomize-controller namespace: flux-system @@ -2494,7 +2574,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/kustomize-controller:v0.8.1 + image: ghcr.io/fluxcd/kustomize-controller:v0.12.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -2539,7 +2619,8 @@ kind: Deployment metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: notification-controller namespace: flux-system @@ -2567,7 +2648,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/notification-controller:v0.8.0 + image: ghcr.io/fluxcd/notification-controller:v0.13.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -2614,7 +2695,8 @@ kind: Deployment metadata: labels: app.kubernetes.io/instance: flux-system - app.kubernetes.io/version: v0.8.1 + app.kubernetes.io/part-of: flux + app.kubernetes.io/version: v0.13.4 control-plane: controller name: source-controller namespace: flux-system @@ -2647,7 +2729,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/source-controller:v0.8.1 + image: ghcr.io/fluxcd/source-controller:v0.12.2 imagePullPolicy: IfNotPresent livenessProbe: httpGet: