Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
clusterctl_ver: "1.2.0"
apptestctl_ver: "0.18.0"
kind_ver: "0.12.0"
GITOPS_FLUX_APP_VERSION: "1.4.0"
GITOPS_FLUX_APP_VERSION: "1.10.0"
GITOPS_INIT_NAMESPACES: "default,org-org-name"
GITOPS_IGNORED_OBJECTS: "org-org-name/clusters-mapi-out-of-band-no-flux-direct"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: ${cluster_name}-image-updates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-hello-app
Expand All @@ -13,7 +13,7 @@ spec:
semver:
range: '>=0.1.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-hello-app
Expand All @@ -8,7 +8,7 @@ spec:
image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
interval: 10m0s
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: ${cluster_name}-image-updates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-hello-app
Expand All @@ -11,7 +11,7 @@ spec:
semver:
range: '>=0.1.0 <1.0.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-hello-app
Expand All @@ -8,7 +8,7 @@ spec:
image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
interval: 10m0s
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-simple-db-app
Expand Down
14 changes: 7 additions & 7 deletions docs/add_wc_environments.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ EOF

# Let' create the image update automation for Flux
cat <<EOF > automatic_updates/imageupdate.yaml
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: \${cluster_name}-image-updates
Expand Down Expand Up @@ -228,7 +228,7 @@ in the `giantswarmpublic.azurecr.io/giantswarm-catalog` registry every 10 minute
```sh
cat <<EOF > imagerepositories.yaml
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: \${cluster_name}-hello-app
Expand All @@ -237,7 +237,7 @@ spec:
image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
interval: 10m0s
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: \${cluster_name}-simple-db-app
Expand All @@ -257,7 +257,7 @@ Let's have Flux automatically roll out all `-dev` releases that are of at least
```sh
cat <<EOF > imagepolicies.yaml
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: \${cluster_name}-hello-app
Expand All @@ -271,7 +271,7 @@ spec:
semver:
range: '>=0.1.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: \${cluster_name}-simple-db-app
Expand Down Expand Up @@ -347,7 +347,7 @@ to automatically introduce possibly breaking changes in major version bump, so l
```sh
cat <<EOF > imagepolicies.yaml
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: \${cluster_name}-hello-app
Expand All @@ -359,7 +359,7 @@ spec:
semver:
range: '>=0.1.0 <1.0.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: \${cluster_name}-simple-db-app
Expand Down
6 changes: 3 additions & 3 deletions docs/apps/automatic_updates_appcr.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export APP_IMAGE_REGISTRY=APP_IMAGE_REGISTRY

```sh
cat <<EOF > imageupdate.yaml
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: ${WC_NAME}-updates
Expand Down Expand Up @@ -100,7 +100,7 @@ scan for new tags:

```sh
cat <<EOF > imagerepository.yaml
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${APP_NAME}
Expand All @@ -115,7 +115,7 @@ scan for new tags:

```sh
cat <<EOF > imagepolicy.yaml
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${APP_NAME}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-hello-world
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-hello-world
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: ${cluster_name}-updates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: ${cluster_name}-hello-world
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: ${cluster_name}-hello-world
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: ${cluster_name}-updates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: hello-app-dev-1-hello-app
Expand All @@ -13,7 +13,7 @@ spec:
semver:
range: '>=0.1.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: hello-app-dev-1-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: hello-app-dev-1-hello-app
Expand All @@ -8,7 +8,7 @@ spec:
image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
interval: 10m0s
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: hello-app-dev-1-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: hello-app-dev-1-image-updates
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: hello-app-staging-1-hello-app
Expand All @@ -11,7 +11,7 @@ spec:
semver:
range: '>=0.1.0 <1.0.0'
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImagePolicy
metadata:
name: hello-app-staging-1-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: hello-app-staging-1-hello-app
Expand All @@ -8,7 +8,7 @@ spec:
image: giantswarmpublic.azurecr.io/giantswarm-catalog/hello-world-app
interval: 10m0s
---
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageRepository
metadata:
name: hello-app-staging-1-simple-db-app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: image.toolkit.fluxcd.io/v1beta1
apiVersion: image.toolkit.fluxcd.io/v1beta2
kind: ImageUpdateAutomation
metadata:
name: hello-app-staging-1-image-updates
Expand Down
Loading