Skip to content

Commit

Permalink
Merge pull request #3 from fluxcd/flux-v2.2.0
Browse files Browse the repository at this point in the history
Update Flux to v2.2.0 GA
stefanprodan authored Dec 12, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents d61aebe + 85c041b commit b368bb1
Showing 9 changed files with 18 additions and 649 deletions.
6 changes: 3 additions & 3 deletions manifests/bases/helm-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
#- https://github.com/fluxcd/helm-controller/releases/download/v0.36.2/helm-controller.crds.yaml
- https://github.com/fluxcd/helm-controller/config/crd?ref=main
- https://github.com/fluxcd/helm-controller/releases/download/v0.36.2/helm-controller.deployment.yaml
- https://github.com/fluxcd/helm-controller/releases/download/v0.37.0/helm-controller.crds.yaml
#- https://github.com/fluxcd/helm-controller/config/crd?ref=main
- https://github.com/fluxcd/helm-controller/releases/download/v0.37.0/helm-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/fluxcd/image-automation-controller/releases/download/v0.36.1/image-automation-controller.crds.yaml
- https://github.com/fluxcd/image-automation-controller/releases/download/v0.36.1/image-automation-controller.deployment.yaml
- https://github.com/fluxcd/image-automation-controller/releases/download/v0.37.0/image-automation-controller.crds.yaml
- https://github.com/fluxcd/image-automation-controller/releases/download/v0.37.0/image-automation-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
4 changes: 2 additions & 2 deletions manifests/bases/image-reflector-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.30.0/image-reflector-controller.crds.yaml
- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.30.0/image-reflector-controller.deployment.yaml
- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.31.1/image-reflector-controller.crds.yaml
- https://github.com/fluxcd/image-reflector-controller/releases/download/v0.31.1/image-reflector-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
6 changes: 3 additions & 3 deletions manifests/bases/kustomize-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
#- https://github.com/fluxcd/kustomize-controller/releases/download/v1.1.1/kustomize-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/config/crd?ref=main
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.1.1/kustomize-controller.deployment.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.2.0/kustomize-controller.crds.yaml
#- https://github.com/fluxcd/kustomize-controller/config/crd?ref=main
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.2.0/kustomize-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
4 changes: 2 additions & 2 deletions manifests/bases/notification-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/fluxcd/notification-controller/releases/download/v1.1.0/notification-controller.crds.yaml
- https://github.com/fluxcd/notification-controller/releases/download/v1.1.0/notification-controller.deployment.yaml
- https://github.com/fluxcd/notification-controller/releases/download/v1.2.2/notification-controller.crds.yaml
- https://github.com/fluxcd/notification-controller/releases/download/v1.2.2/notification-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
4 changes: 2 additions & 2 deletions manifests/bases/source-controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/fluxcd/source-controller/releases/download/v1.2.0/source-controller.crds.yaml
- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.crds.yaml
#- https://github.com/fluxcd/source-controller/config/crd?ref=main
- https://github.com/fluxcd/source-controller/releases/download/v1.2.0/source-controller.deployment.yaml
- https://github.com/fluxcd/source-controller/releases/download/v1.2.2/source-controller.deployment.yaml
- account.yaml
transformers:
- labels.yaml
3 changes: 0 additions & 3 deletions manifests/install/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -16,13 +16,10 @@ transformers:
images:
- name: fluxcd/source-controller
newName: ghcr.io/fluxcd/source-controller
newTag: v1.2.0
- name: fluxcd/kustomize-controller
newName: ghcr.io/fluxcd/kustomize-controller
newTag: preview-ba308c5a
- name: fluxcd/helm-controller
newName: ghcr.io/fluxcd/helm-controller
newTag: preview-842a9425
- name: fluxcd/notification-controller
newName: ghcr.io/fluxcd/notification-controller
- name: fluxcd/image-reflector-controller

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Code generated by timoni. DO NOT EDIT.

//timoni:generate timoni vendor crd -f https://raw.githubusercontent.com/fluxcd/helm-controller/new-drift-detection/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
//timoni:generate timoni vendor crd -f https://raw.githubusercontent.com/fluxcd/helm-controller/v0.37.0/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml

package v2beta2

@@ -396,7 +396,8 @@ import "strings"
}
}]

// JSON 6902 patches, defined as inline YAML objects.
// JSON 6902 patches, defined as inline YAML objects. Deprecated:
// use Patches instead.
patchesJson6902?: [...{
// Patch contains the JSON6902 patch document with an array of
// operation objects.
@@ -465,6 +466,7 @@ import "strings"
}]

// Strategic merge patches, defined as inline YAML objects.
// Deprecated: use Patches instead.
patchesStrategicMerge?: [...]
}
}]

0 comments on commit b368bb1

Please sign in to comment.