mirror of
				https://github.com/fluxcd/flux2.git
				synced 2025-10-31 16:26:36 +08:00 
			
		
		
		
	Merge pull request #5533 from fluxcd/conform-k8s-1.34.1
Set Kubernetes 1.32 as min supported version
This commit is contained in:
		
							
								
								
									
										1
									
								
								.github/workflows/backport.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/backport.yaml
									
									
									
									
										vendored
									
									
								
							| @ -2,6 +2,7 @@ name: backport | |||||||
| on: | on: | ||||||
|   pull_request_target: |   pull_request_target: | ||||||
|     types: [closed, labeled] |     types: [closed, labeled] | ||||||
|  | permissions: read-all | ||||||
| jobs: | jobs: | ||||||
|   backport: |   backport: | ||||||
|     permissions: |     permissions: | ||||||
|  | |||||||
							
								
								
									
										8
									
								
								.github/workflows/conformance.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/conformance.yaml
									
									
									
									
										vendored
									
									
								
							| @ -19,7 +19,7 @@ jobs: | |||||||
|       matrix: |       matrix: | ||||||
|         # Keep this list up-to-date with https://endoflife.date/kubernetes |         # Keep this list up-to-date with https://endoflife.date/kubernetes | ||||||
|         # Build images with https://github.com/fluxcd/flux-benchmark/actions/workflows/build-kind.yaml |         # Build images with https://github.com/fluxcd/flux-benchmark/actions/workflows/build-kind.yaml | ||||||
|         KUBERNETES_VERSION: [1.31.5, 1.32.1, 1.33.0, 1.34.0] |         KUBERNETES_VERSION: [1.32.1, 1.33.0, 1.34.1] | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout |       - name: Checkout | ||||||
| @ -42,7 +42,7 @@ jobs: | |||||||
|       - name: Setup Kubernetes |       - name: Setup Kubernetes | ||||||
|         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           version: v0.27.0 |           version: v0.30.0 | ||||||
|           cluster_name: ${{ steps.prep.outputs.CLUSTER }} |           cluster_name: ${{ steps.prep.outputs.CLUSTER }} | ||||||
|           node_image: ghcr.io/fluxcd/kindest/node:v${{ matrix.KUBERNETES_VERSION }}-arm64 |           node_image: ghcr.io/fluxcd/kindest/node:v${{ matrix.KUBERNETES_VERSION }}-arm64 | ||||||
|       - name: Run e2e tests |       - name: Run e2e tests | ||||||
| @ -76,7 +76,7 @@ jobs: | |||||||
|       matrix: |       matrix: | ||||||
|         # Keep this list up-to-date with https://endoflife.date/kubernetes |         # Keep this list up-to-date with https://endoflife.date/kubernetes | ||||||
|         # Available versions can be found with "replicated cluster versions" |         # Available versions can be found with "replicated cluster versions" | ||||||
|         K3S_VERSION: [ 1.31.8, 1.32.4, 1.33.0 ] |         K3S_VERSION: [ 1.32.8, 1.33.4 ] | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout |       - name: Checkout | ||||||
| @ -169,7 +169,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         # Keep this list up-to-date with https://endoflife.date/red-hat-openshift |         # Keep this list up-to-date with https://endoflife.date/red-hat-openshift | ||||||
|         OPENSHIFT_VERSION: [ 4.18.0-okd ] |         OPENSHIFT_VERSION: [ 4.19.0-okd ] | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout |       - name: Checkout | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.github/workflows/e2e-azure.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/e2e-azure.yaml
									
									
									
									
										vendored
									
									
								
							| @ -22,7 +22,7 @@ permissions: | |||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   e2e-aks: |   e2e-aks: | ||||||
|     runs-on: ubuntu-22.04 |     runs-on: ubuntu-latest | ||||||
|     defaults: |     defaults: | ||||||
|       run: |       run: | ||||||
|         working-directory: ./tests/integration |         working-directory: ./tests/integration | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								.github/workflows/e2e-bootstrap.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/e2e-bootstrap.yaml
									
									
									
									
										vendored
									
									
								
							| @ -28,11 +28,11 @@ jobs: | |||||||
|       - name: Setup Kubernetes |       - name: Setup Kubernetes | ||||||
|         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           version: v0.24.0 |           version: v0.30.0 | ||||||
|           cluster_name: kind |           cluster_name: kind | ||||||
|           # The versions below should target the newest Kubernetes version |           # The versions below should target the newest Kubernetes version | ||||||
|           # Keep this up-to-date with https://endoflife.date/kubernetes |           # Keep this up-to-date with https://endoflife.date/kubernetes | ||||||
|           node_image: ghcr.io/fluxcd/kindest/node:v1.33.0-amd64 |           node_image: ghcr.io/fluxcd/kindest/node:v1.32.1-amd64 | ||||||
|           kubectl_version: v1.32.0 |           kubectl_version: v1.32.0 | ||||||
|       - name: Setup Kustomize |       - name: Setup Kustomize | ||||||
|         uses: fluxcd/pkg/actions/kustomize@7f090e931301b18cbdc37d9a28b08f84ba1270fb # main |         uses: fluxcd/pkg/actions/kustomize@7f090e931301b18cbdc37d9a28b08f84ba1270fb # main | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.github/workflows/e2e-gcp.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/e2e-gcp.yaml
									
									
									
									
										vendored
									
									
								
							| @ -22,7 +22,7 @@ permissions: | |||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   e2e-gcp: |   e2e-gcp: | ||||||
|     runs-on: ubuntu-22.04 |     runs-on: ubuntu-latest | ||||||
|     defaults: |     defaults: | ||||||
|       run: |       run: | ||||||
|         working-directory: ./tests/integration |         working-directory: ./tests/integration | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								.github/workflows/e2e.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/e2e.yaml
									
									
									
									
										vendored
									
									
								
							| @ -34,13 +34,13 @@ jobs: | |||||||
|       - name: Setup Kubernetes |       - name: Setup Kubernetes | ||||||
|         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           version: v0.24.0 |           version: v0.30.0 | ||||||
|           cluster_name: kind |           cluster_name: kind | ||||||
|           wait: 5s |           wait: 5s | ||||||
|           config: .github/kind/config.yaml # disable KIND-net |           config: .github/kind/config.yaml # disable KIND-net | ||||||
|           # The versions below should target the oldest supported Kubernetes version |           # The versions below should target the oldest supported Kubernetes version | ||||||
|           # Keep this up-to-date with https://endoflife.date/kubernetes |           # Keep this up-to-date with https://endoflife.date/kubernetes | ||||||
|           node_image: ghcr.io/fluxcd/kindest/node:v1.31.5-amd64 |           node_image: ghcr.io/fluxcd/kindest/node:v1.32.1-amd64 | ||||||
|           kubectl_version: v1.32.0 |           kubectl_version: v1.32.0 | ||||||
|       - name: Setup Calico for network policy |       - name: Setup Calico for network policy | ||||||
|         run: | |         run: | | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								.github/workflows/scan.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/scan.yaml
									
									
									
									
										vendored
									
									
								
							| @ -7,6 +7,7 @@ on: | |||||||
|     branches: [ 'main', 'release/**' ] |     branches: [ 'main', 'release/**' ] | ||||||
|   schedule: |   schedule: | ||||||
|     - cron: '18 10 * * 3' |     - cron: '18 10 * * 3' | ||||||
|  | permissions: read-all | ||||||
| jobs: | jobs: | ||||||
|   analyze: |   analyze: | ||||||
|     permissions: |     permissions: | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								.github/workflows/sync-labels.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/sync-labels.yaml
									
									
									
									
										vendored
									
									
								
							| @ -6,6 +6,7 @@ on: | |||||||
|       - main |       - main | ||||||
|     paths: |     paths: | ||||||
|       - .github/labels.yaml |       - .github/labels.yaml | ||||||
|  | permissions: read-all | ||||||
| jobs: | jobs: | ||||||
|   sync-labels: |   sync-labels: | ||||||
|     permissions: |     permissions: | ||||||
|  | |||||||
| @ -60,7 +60,7 @@ type checkFlags struct { | |||||||
| } | } | ||||||
|  |  | ||||||
| var kubernetesConstraints = []string{ | var kubernetesConstraints = []string{ | ||||||
| 	">=1.31.0-0", | 	">=1.32.0-0", | ||||||
| } | } | ||||||
|  |  | ||||||
| var checkArgs checkFlags | var checkArgs checkFlags | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								cmd/flux/testdata/check/check_pre.golden
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								cmd/flux/testdata/check/check_pre.golden
									
									
									
									
										vendored
									
									
								
							| @ -1,3 +1,3 @@ | |||||||
| ► checking prerequisites | ► checking prerequisites | ||||||
| ✔ Kubernetes {{ .serverVersion }} >=1.31.0-0 | ✔ Kubernetes {{ .serverVersion }} >=1.32.0-0 | ||||||
| ✔ prerequisites checks passed | ✔ prerequisites checks passed | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Stefan Prodan
					Stefan Prodan