Skip to content

Commit

Permalink
deps: support Kubernetes 1.28 (#2242)
Browse files Browse the repository at this point in the history
  • Loading branch information
@3u13r
3u13r authored Aug 18, 2023
1 parent 38dcb3d commit 8325f99
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 109 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test-daily.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
kubernetesVersion: ["1.26"] # should be default
kubernetesVersion: ["1.27"] # should be default
provider: ["gcp", "azure", "aws"]
refStream: ["ref/main/stream/debug/?", "ref/release/stream/stable/?"]
test: ["sonobuoy full"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test-manual.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ on:
required: true
kubernetesVersion:
description: "Kubernetes version to create the cluster from."
default: "1.26"
default: "1.27"
required: true
cliVersion:
description: "Version of a released CLI to download. Leave empty to build the CLI from the checked out ref."
Expand Down
53 changes: 27 additions & 26 deletions .github/workflows/e2e-test-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,119 +47,120 @@ jobs:
# sonobuoy full test on all k8s versions
- test: "sonobuoy full"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"


- test: "sonobuoy full"
provider: "gcp"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "azure"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "aws"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
runner: "ubuntu-22.04"

- test: "sonobuoy full"
provider: "gcp"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "azure"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"
runner: "ubuntu-22.04"
- test: "sonobuoy full"
provider: "aws"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"
runner: "ubuntu-22.04"

# verify test on latest k8s version
- test: "verify"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "verify"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "verify"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

# recover test on latest k8s version
- test: "recover"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "recover"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "recover"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

# lb test on latest k8s version
- test: "lb"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "lb"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "lb"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

# autoscaling test on latest k8s version, not supported on AWS
# autoscaling test on latest k8s version
- test: "autoscaling"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "autoscaling"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "autoscaling"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

# perf-bench test on latest k8s version, not supported on AWS
- test: "perf-bench"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
- test: "perf-bench"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

#
# Tests on macOS runner
#
- test: "verify"
provider: "azure"
kubernetes-version: "v1.26"
kubernetes-version: "v1.28"
runner: "macos-12"
- test: "recover"
provider: "gcp"
kubernetes-version: "v1.26"
kubernetes-version: "v1.28"
runner: "macos-12"
runs-on: ${{ matrix.runner }}
permissions:
Expand Down
56 changes: 30 additions & 26 deletions .github/workflows/e2e-test-weekly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,104 +54,108 @@ jobs:
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"

- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"

- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"
- test: "sonobuoy full"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.25"
kubernetes-version: "v1.26"

# verify test on latest k8s version
- test: "verify"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "verify"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
azureSNPEnforcementPolicy: "equal" # This run checks for unknown ID Key disgests.
- test: "verify"
provider: "aws"
refStream: "ref/main/stream/debug/?"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"

# recover test on latest k8s version
- test: "recover"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "recover"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "recover"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"

# lb test on latest k8s version
- test: "lb"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "lb"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "lb"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"

# autoscaling test on latest k8s version, not supported on AWS
# autoscaling test on latest k8s version
- test: "autoscaling"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "autoscaling"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "autoscaling"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.28"

# perf-bench test on latest k8s version, not supported on AWS
- test: "perf-bench"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"
- test: "perf-bench"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.27"
kubernetes-version: "v1.28"

#
# Tests on release-stable refStream
Expand All @@ -161,15 +165,15 @@ jobs:
- test: "verify"
refStream: "ref/release/stream/stable/?"
provider: "gcp"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
- test: "verify"
refStream: "ref/release/stream/stable/?"
provider: "azure"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
- test: "verify"
refStream: "ref/release/stream/stable/?"
provider: "aws"
kubernetes-version: "v1.26"
kubernetes-version: "v1.27"
runs-on: ubuntu-22.04
permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/reference/cli.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ constellation config generate {aws|azure|gcp|openstack|qemu|stackit} [flags]
```
-a, --attestation string attestation variant to use {aws-sev-snp|aws-nitro-tpm|azure-sev-snp|azure-trustedlaunch|gcp-sev-es|qemu-vtpm}. If not specified, the default for the cloud provider is used
-h, --help help for generate
-k, --kubernetes string Kubernetes version to use in format MAJOR.MINOR (default "v1.26")
-k, --kubernetes string Kubernetes version to use in format MAJOR.MINOR (default "v1.27")
```

### Options inherited from parent commands
Expand Down
4 changes: 2 additions & 2 deletions internal/config/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,12 +642,12 @@ func (c *Config) validateK8sVersion(fl validator.FieldLevel) bool {
// supported patch version as PATCH.
func K8sVersionFromMajorMinor(version string) string {
switch version {
case semver.MajorMinor(string(versions.V1_25)):
return string(versions.V1_25)
case semver.MajorMinor(string(versions.V1_26)):
return string(versions.V1_26)
case semver.MajorMinor(string(versions.V1_27)):
return string(versions.V1_27)
case semver.MajorMinor(string(versions.V1_28)):
return string(versions.V1_28)
default:
return ""
}
Expand Down
Loading

0 comments on commit 8325f99

Please sign in to comment.