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

Bump min Kubernetes API to v1.22 #11737

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Bump min Kubernetes API to v1.22 #11737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f9a454
Bump min Kubernetes API to v1.22
olix0r Dec 11, 2023
3c7a55b
helm: Remove k8s version reference in README blurb
olix0r Dec 11, 2023
b62ca6d
bump versino in policy test
olix0r Dec 11, 2023
68b887d
bump versino in mc test
olix0r Dec 11, 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
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
strategy:
matrix:
k8s:
- v1.21
- v1.22
- v1.28
steps:
- uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
strategy:
matrix:
k8s:
- v1.21
- v1.22
- v1.28
steps:
- uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d
Expand Down
4 changes: 2 additions & 2 deletions bin/_test-helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# proper messages
set +e

k8s_version_min='+v1.21'
k8s_version_max='+v1.26'
k8s_version_min='+v1.22'
k8s_version_max='+v1.28'

bindir=$( cd "${BASH_SOURCE[0]%/*}" && pwd )
testdir="$bindir"/../test/integration
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd-control-plane/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type: application
home: https://linkerd.io
keywords:
- service-mesh
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
name: "linkerd-control-plane"
sources:
- https://github.com/linkerd/linkerd2/
Expand Down
6 changes: 3 additions & 3 deletions charts/linkerd-control-plane/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ for your microservices — with no code change required.

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down Expand Up @@ -135,7 +135,7 @@ extensions:

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
4 changes: 2 additions & 2 deletions charts/linkerd-control-plane/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd-crds/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: application
home: https://linkerd.io
keywords:
- service-mesh
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
name: "linkerd-crds"
sources:
- https://github.com/linkerd/linkerd2/
Expand Down
6 changes: 3 additions & 3 deletions charts/linkerd-crds/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ for your microservices — with no code change required.

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down Expand Up @@ -60,7 +60,7 @@ helm install linkerd-crds -n linkerd --create-namespace linkerd/linkerd-crds

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
4 changes: 2 additions & 2 deletions charts/linkerd-crds/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd2-cni/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: |
Linkerd [CNI plugin](https://linkerd.io/2/features/cni/) takes care of setting
up your pod's network so incoming and outgoing traffic is proxied through the
data plane.
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
icon: https://linkerd.io/images/logo-only-200h.png
name: "linkerd2-cni"
version: 30.13.1-edge
2 changes: 1 addition & 1 deletion charts/linkerd2-cni/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data plane.

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: |
home: https://linkerd.io
keywords:
- service-mesh
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
name: linkerd-jaeger
sources:
- https://github.com/linkerd/linkerd2/
Expand Down
4 changes: 2 additions & 2 deletions jaeger/charts/linkerd-jaeger/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ OpenCensus and Jaeger.

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
Expand Down Expand Up @@ -62,7 +62,7 @@ helm install linkerd-jaeger -n linkerd-jaeger --create-namespace linkerd/linkerd

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
Expand Down
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster-link/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description: |
`cluster-credentials` secret and the Link CR, which are not found in this
chart. Therefore this chart is not a replacement for that command, and
shouldn't be used as-is unless you really know what you're doing ;-)
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
icon: https://linkerd.io/images/logo-only-200h.png
name: "linkerd-multicluster-link"
version: 0.2.0
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster-link/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ shouldn't be used as-is unless you really know what you're doing ;-)

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: |
home: https://linkerd.io
keywords:
- service-mesh
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
name: "linkerd-multicluster"
sources:
- https://github.com/linkerd/linkerd2/
Expand Down
6 changes: 3 additions & 3 deletions multicluster/charts/linkerd-multicluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ linking to remote clusters

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down Expand Up @@ -60,7 +60,7 @@ helm install linkerd-multicluster -n linkerd-multicluster --create-namespace lin

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
4 changes: 2 additions & 2 deletions multicluster/charts/linkerd-multicluster/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth"
)

var minAPIVersion = [3]int{1, 21, 0}
var minAPIVersion = [3]int{1, 22, 0}

// KubernetesAPI provides a client for accessing a Kubernetes cluster.
// TODO: support ServiceProfile ClientSet. A prerequisite is moving the
Expand Down
2 changes: 1 addition & 1 deletion policy-controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ async-trait = "0.1"
drain = "0.1"
futures = { version = "0.3", default-features = false }
k8s-gateway-api = "0.13"
k8s-openapi = { version = "0.19", features = ["v1_20"] }
k8s-openapi = { version = "0.19", features = ["v1_22"] }
hyper = { version = "0.14", features = ["http1", "http2", "runtime", "server"] }
ipnet = { version = "2", default-features = false }
linkerd-policy-controller-core = { path = "./core" }
Expand Down
2 changes: 1 addition & 1 deletion policy-controller/k8s/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
k8s-openapi = { version = "0.19", default-features = false, features = [
"v1_20",
"v1_22",
] }
k8s-gateway-api = "0.13"
kube = { version = "0.85", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion policy-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ hyper = { version = "0.14", features = ["client", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2"
k8s-gateway-api = "0.13"
k8s-openapi = { version = "0.19", features = ["v1_20"] }
k8s-openapi = { version = "0.19", features = ["v1_22"] }
linkerd-policy-controller-core = { path = "../policy-controller/core" }
linkerd-policy-controller-k8s-api = { path = "../policy-controller/k8s/api" }
maplit = "1"
Expand Down
2 changes: 1 addition & 1 deletion viz/charts/linkerd-viz/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: |
home: https://linkerd.io
keywords:
- service-mesh
kubeVersion: ">=1.21.0-0"
kubeVersion: ">=1.22.0-0"
name: "linkerd-viz"
sources:
- https://github.com/linkerd/linkerd2/
Expand Down
6 changes: 3 additions & 3 deletions viz/charts/linkerd-viz/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ components for Linkerd.

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down Expand Up @@ -60,7 +60,7 @@ helm install linkerd-viz -n linkerd-viz --create-namespace linkerd/linkerd-viz

## Requirements

Kubernetes: `>=1.21.0-0`
Kubernetes: `>=1.22.0-0`

| Repository | Name | Version |
|------------|------|---------|
Expand Down
4 changes: 2 additions & 2 deletions viz/charts/linkerd-viz/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

## Quickstart and documentation

You can run Linkerd on any Kubernetes 1.21+ cluster in a matter of seconds. See
the [Linkerd Getting Started Guide][getting-started] for how.
You can run Linkerd on any Kubernetes cluster in a matter of seconds. See the
[Linkerd Getting Started Guide][getting-started] for how.

For more comprehensive documentation, start with the [Linkerd
docs][linkerd-docs].
Expand Down
Loading