bump

torumakabe · Feb 19, 2025 · d22343d · d22343d
1 parent e91a305
commit d22343d
Show file tree

Hide file tree

Showing 45 changed files with 124 additions and 134 deletions.
diff --git a/.github/workflows/ci-terraform-blue.yaml b/.github/workflows/ci-terraform-blue.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.10.1
+          terraform_version: 1.10.5
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -83,7 +83,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.54.0
+          tflint_version: v0.55.0
 
       - name: "Run TFLint"
         id: tflint

diff --git a/.github/workflows/ci-terraform-green.yaml b/.github/workflows/ci-terraform-green.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.10.1
+          terraform_version: 1.10.5
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -83,7 +83,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.54.0
+          tflint_version: v0.55.0
 
       - name: "Run TFLint"
         id: tflint

diff --git a/.github/workflows/ci-terraform-shared.yaml b/.github/workflows/ci-terraform-shared.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.10.1
+          terraform_version: 1.10.5
           terraform_wrapper: false
 
       - name: "Terraform Format"
@@ -47,7 +47,7 @@ jobs:
       - name: "Setup TFLint"
         uses: terraform-linters/setup-tflint@v4
         with:
-          tflint_version: v0.54.0
+          tflint_version: v0.55.0
 
       - name: "Run TFLint"
         id: tflint

diff --git a/README.md b/README.md
@@ -29,12 +29,12 @@ DRY is a great concept, and you should be aware that it will come true in the fu
 
 Prerequisites & tested
 
-- [Terraform](https://www.terraform.io/docs/index.html): 1.10.1
-  - hashicorp/azurerm: 4.13.0
+- [Terraform](https://www.terraform.io/docs/index.html): 1.10.5
+  - hashicorp/azurerm: 4.19.0
   - State store: Local
-- [TFLint](https://github.com/terraform-linters/tflint): 0.54.0
+- [TFLint](https://github.com/terraform-linters/tflint): 0.55.0
   - [azurerm plugin](https://github.com/terraform-linters/tflint-ruleset-azurerm): 0.27.0
-- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.5
+- [Azure/kubelogin](https://github.com/Azure/kubelogin): 0.1.6
 - Ubuntu: 22.04.5 LTS
 
 ### Privileges required for execution

diff --git a/flux/apps/base/demoapp/image-update/automation.yaml b/flux/apps/base/demoapp/image-update/automation.yaml
@@ -1,4 +1,4 @@
-apiVersion: image.toolkit.fluxcd.io/v1beta1
+apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImageUpdateAutomation
 metadata:
   name: flux-system
@@ -12,7 +12,7 @@ spec:
       author:
         email: [email protected]
         name: fluxcdbot
-      messageTemplate: '{{range .Updated.Images}}{{println .}}{{end}}'
+      messageTemplate: "{{range .Updated.Images}}{{println .}}{{end}}"
     push:
       branch: main
   interval: 10m0s

diff --git a/flux/apps/base/demoapp/ingress.yaml b/flux/apps/base/demoapp/ingress.yaml
@@ -13,4 +13,4 @@ spec:
                 port:
                   number: 80
             path: /
-            pathType: Prefix
+            pathType: ImplementationSpecific
diff --git a/flux/apps/base/podinfo/ingress.yaml b/flux/apps/base/podinfo/ingress.yaml
@@ -5,8 +5,6 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      rewrite ^(/podinfo)$ $1/ redirect;
 spec:
   ingressClassName: nginx
   rules:
@@ -18,4 +16,4 @@ spec:
                 port:
                   number: 9898
             path: /podinfo(/|$)(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
diff --git a/flux/apps/base/podinfo/release.yaml b/flux/apps/base/podinfo/release.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: podinfo-frontend
@@ -26,7 +26,7 @@ spec:
     logLevel: info
     backend: http://podinfo-backend:9898/echo
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: podinfo-backend

diff --git a/flux/apps/blue-dev/podinfo/kustomization.yaml b/flux/apps/blue-dev/podinfo/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../../base/podinfo
 patches:
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-frontend
@@ -20,7 +20,7 @@ patches:
       name: podinfo-frontend
       namespace: podinfo
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-backend

diff --git a/flux/apps/blue-e2e/podinfo/kustomization.yaml b/flux/apps/blue-e2e/podinfo/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../../base/podinfo
 patches:
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-frontend
@@ -20,7 +20,7 @@ patches:
       name: podinfo-frontend
       namespace: podinfo
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-backend

diff --git a/flux/apps/green-dev/podinfo/kustomization.yaml b/flux/apps/green-dev/podinfo/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../../base/podinfo
 patches:
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-frontend
@@ -20,7 +20,7 @@ patches:
       name: podinfo-frontend
       namespace: podinfo
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-backend

diff --git a/flux/apps/green-e2e/podinfo/kustomization.yaml b/flux/apps/green-e2e/podinfo/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../../base/podinfo
 patches:
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-frontend
@@ -20,7 +20,7 @@ patches:
       name: podinfo-frontend
       namespace: podinfo
   - patch: |-
-      apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       metadata:
         name: podinfo-backend

diff --git a/flux/clusters/base/apps.yaml b/flux/clusters/base/apps.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: apps

diff --git a/flux/clusters/base/infrastructure.yaml b/flux/clusters/base/infrastructure.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: infrastructure
@@ -9,11 +9,11 @@ spec:
     name: flux-system
   prune: true
   healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+    - apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       name: nginx
       namespace: nginx
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+    - apiVersion: helm.toolkit.fluxcd.io/v2
       kind: HelmRelease
       name: chaos-mesh
       namespace: chaos-testing

diff --git a/flux/clusters/blue-dev/kustomization.yaml b/flux/clusters/blue-dev/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps

diff --git a/flux/clusters/blue-e2e/kustomization.yaml b/flux/clusters/blue-e2e/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps

diff --git a/flux/clusters/blue/kustomization.yaml b/flux/clusters/blue/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps
@@ -27,4 +27,3 @@ patches:
       kind: Kustomization
       name: apps
       namespace: flux-system
-
diff --git a/flux/clusters/green-dev/kustomization.yaml b/flux/clusters/green-dev/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps
@@ -27,4 +27,3 @@ patches:
       kind: Kustomization
       name: apps
       namespace: flux-system
-
diff --git a/flux/clusters/green-e2e/kustomization.yaml b/flux/clusters/green-e2e/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps

diff --git a/flux/clusters/green/kustomization.yaml b/flux/clusters/green/kustomization.yaml
@@ -4,7 +4,7 @@ resources:
   - ../base
 patches:
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: infrastructure
@@ -16,7 +16,7 @@ patches:
       name: infrastructure
       namespace: flux-system
   - patch: |-
-      apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+      apiVersion: kustomize.toolkit.fluxcd.io/v1
       kind: Kustomization
       metadata:
         name: apps
@@ -27,4 +27,3 @@ patches:
       kind: Kustomization
       name: apps
       namespace: flux-system
-
diff --git a/flux/infrastructure/base/chaos-mesh/release.yaml b/flux/infrastructure/base/chaos-mesh/release.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: chaos-mesh
@@ -24,12 +24,12 @@ spec:
   values:
     controllerManager:
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
     chaosDaemon:
       runtime: containerd
       socketPath: /run/containerd/containerd.sock
     dnsServer:
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists