Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: update to flux2 v2 #319

Merged
merged 2 commits into from
Jul 10, 2023
Merged

feat!: update to flux2 v2 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e637270
feat!: update to flux2 v2
kharf Jul 10, 2023
a9661eb
docs: update compatibility documentation
kharf Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A catalog of Kubernetes tools for your Flux2 GitOps setup
Set up a [GitRepository](https://fluxcd.io/docs/components/source/gitrepositories/) source, which you can use for your Kustomizations to apply the manifests found in the catalog:

```yaml
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
metadata:
name: flux-k8s-stack
Expand All @@ -24,11 +24,11 @@ You're ready to browse the [Catalog](#Catalog).

---
## Compatibility
Starting with v4.2.0 we keep track of compatibility between this catalog and flux2. Other versions might work too as long as there are no breaking changes.
We keep track of compatibility between this catalog and flux2. Other versions might work too as long as there are no breaking changes.
| flux-k8s-stack version | flux2 version |
| ---------------------- | ------------- |
| v5 | v0.41.2 |
| v4 | v0.41.2 |
| >= v9 | v2.0.0 |
| <= v8 | v0.41.2 |

---
## Catalog
Expand Down
4 changes: 2 additions & 2 deletions catalog/cert-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#### Kustomizations
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cert-manager-namespace
Expand All @@ -21,7 +21,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cert-manager
Expand Down
4 changes: 2 additions & 2 deletions catalog/cert-manager/test/cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cert-manager-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: cert-manager
Expand Down
10 changes: 5 additions & 5 deletions catalog/emissary-ingress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

### Basic setup
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress-namespace
Expand All @@ -21,7 +21,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress
Expand All @@ -43,7 +43,7 @@ spec:
This will deploy emissary-ingress with a NodePort service and a GCP BackendConfig as described [here](https://www.getambassador.io/docs/emissary/latest/topics/running/ambassador-with-gke/#5-configure-backendconfig-for-health-checks).

```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress-namespace
Expand All @@ -58,7 +58,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress
Expand All @@ -83,7 +83,7 @@ Ingress, Listener and Hosts manifests are expected to be in ./infrastructure/dev

#### Kustomization
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress-config
Expand Down
6 changes: 3 additions & 3 deletions catalog/emissary-ingress/test/emissary-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress-config
Expand All @@ -30,7 +30,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: emissary-ingress
Expand Down
4 changes: 2 additions & 2 deletions catalog/ingress-nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To use this stack you have to apply the following configuration (and the GitRepo

```yaml
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: ingress-nginx-namespace
Expand All @@ -23,7 +23,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: ingress-nginx
Expand Down
4 changes: 2 additions & 2 deletions catalog/ingress-nginx/test/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: ingress-nginx-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: ingress-nginx
Expand Down
10 changes: 5 additions & 5 deletions catalog/istio-stack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To use this stack you have to apply 2 configurations (and the GitRepository sour

```yaml
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-stack-namespace
Expand All @@ -29,7 +29,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-system
Expand All @@ -53,7 +53,7 @@ This will set up the base istio and additionally add some google specific annota

```yaml
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-stack-namespace
Expand All @@ -68,7 +68,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-system
Expand Down Expand Up @@ -119,7 +119,7 @@ To use Kiali, you have to apply the following configuration (and the GitReposito

```yaml
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kiali
Expand Down
6 changes: 3 additions & 3 deletions catalog/istio-stack/test/istio-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-stack-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: istio-stack
Expand Down Expand Up @@ -41,7 +41,7 @@ spec:
name: istio-ingressgateway
namespace: istio-system
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kiali
Expand Down
4 changes: 2 additions & 2 deletions catalog/keda/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#### Kustomizations
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: keda-namespace
Expand All @@ -21,7 +21,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: keda
Expand Down
4 changes: 2 additions & 2 deletions catalog/keda/test/keda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: keda-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: keda
Expand Down
16 changes: 8 additions & 8 deletions catalog/kube-prometheus-stack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

### Basic setup
```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack-namespace
Expand All @@ -21,7 +21,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack
Expand All @@ -43,7 +43,7 @@ spec:
This will deploy kube-prometheus-stack with CoreDNS disabled and KubeDNS enabled:

```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack-namespace
Expand All @@ -58,7 +58,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack
Expand All @@ -81,7 +81,7 @@ spec:
This will deploy kube-prometheus-stack with CoreDNS disabled and KubeDNS enabled and linkerd scrape configs:

```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack-namespace
Expand All @@ -96,7 +96,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack
Expand All @@ -119,7 +119,7 @@ spec:
This will deploy kube-prometheus-stack with CoreDNS enabled and KubeDNS disbaled and linkerd scrape configs:

```yaml
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack-namespace
Expand All @@ -134,7 +134,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack
Expand Down
6 changes: 3 additions & 3 deletions catalog/kube-prometheus-stack/test/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kube-prometheus-stack
Expand All @@ -31,7 +31,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: linkerd-test
Expand Down
4 changes: 2 additions & 2 deletions catalog/kyverno/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To use this stack you have to apply the following configuration (and the GitRepo

```yaml
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kyverno-namespace
Expand All @@ -23,7 +23,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kyverno
Expand Down
4 changes: 2 additions & 2 deletions catalog/kyverno/test/kyverno.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kyverno-namespace
Expand All @@ -13,7 +13,7 @@ spec:
prune: true
wait: true
---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: kyverno
Expand Down
Loading
Loading