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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/operator-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
# Test on all supported K8s versions (matches docs/kubernetes-support.md)
k8s-version: ["1.30.13", "1.31.9", "1.32.5", "1.33.1"]
k8s-version: ["1.31.12", "1.32.8", "1.33.4", "1.34.0"]
fail-fast: false # Continue testing other versions if one fails
steps:
- uses: actions/checkout@v4
Expand All @@ -75,7 +75,7 @@ jobs:
id: kind
uses: helm/kind-action@v1
with:
version: v0.29.0
version: v0.30.0
node_image: kindest/node:v${{ matrix.k8s-version }}
config: operator/config/local-dev/kind-config.yaml
cluster_name: kind
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/cleanup-webhook-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
path: namespace
containers:
- name: cleanup
image: {{ .Values.webhook.removalImage | default "bitnami/kubectl" }}{{- if .Values.webhook.removalDigest }}{{- if .Values.webhook.removalTag }}:{{ .Values.webhook.removalTag | default "1.33.1" }}@{{ .Values.webhook.removalDigest }}{{- else }}@{{ .Values.webhook.removalDigest }}{{- end }}{{- else }}:{{ .Values.webhook.removalTag | default "1.33.1" }}{{- end }}
image: {{ .Values.webhook.removalImage | default "bitnami/kubectl" }}{{- if .Values.webhook.removalDigest }}{{- if .Values.webhook.removalTag }}:{{ .Values.webhook.removalTag | default "latest" }}@{{ .Values.webhook.removalDigest }}{{- else }}@{{ .Values.webhook.removalDigest }}{{- end }}{{- else }}:{{ .Values.webhook.removalTag | default "latest" }}{{- end }}
imagePullPolicy: Always
securityContext:
allowPrivilegeEscalation: false
Expand Down
42 changes: 40 additions & 2 deletions chart/templates/skyhook-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,9 @@ spec:
in a Container.
properties:
name:
description: Name of the environment variable. Must be a
C_IDENTIFIER.
description: |-
Name of the environment variable.
May consist of any printable ASCII characters except '='.
type: string
value:
description: |-
Expand Down Expand Up @@ -304,6 +305,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
fileKeyRef:
description: |-
FileKeyRef selects a key of the env file.
Requires the EnvFiles feature gate to be enabled.
properties:
key:
description: |-
The key within the env file. An invalid key will prevent the pod from starting.
The keys defined within a source may consist of any printable ASCII characters except '='.
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
type: string
optional:
default: false
description: |-
Specify whether the file or its key must be defined. If the file or key
does not exist, then the env var is not published.
If optional is set to true and the specified key does not exist,
the environment variable will not be set in the Pod's containers.

If optional is set to false and the specified key does not exist,
an error will be returned during Pod creation.
type: boolean
path:
description: |-
The path within the volume from which to select the file.
Must be relative and may not contain the '..' path or start with '..'.
type: string
volumeName:
description: The name of the volume mount containing
the env file.
type: string
required:
- key
- path
- volumeName
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only resources limits and requests
Expand Down
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ webhook:

## uninstall image for cleaning up webhook resources
removalImage: bitnami/kubectl
removalTag: 1.33.1
removalDigest: "sha256:9081a6f83f4febf47369fc46b6f0f7683c7db243df5b43fc9defe51b0471a950"
removalTag: latest
removalDigest: "sha256:1bc359beb3ae3982591349df11db50b0917b0596e8bed8ab9cf0c8a84a3502d1"

metrics:
addServiceAccountBinding: false
Expand Down
12 changes: 6 additions & 6 deletions docs/kubernetes-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This document outlines Skyhook's approach to supporting different Kubernetes ver

| Kubernetes Version | Skyhook Version | Status | Notes |
|--------------------|-----------------|---------|-------|
| 1.33, 1.32, 1.31 | v0.9.0+ | ✅ Fully Supported | Current stable versions |
| 1.34, 1.33, 1.32, 1.31 | v0.9.0+ | ✅ Fully Supported | Current stable versions |
| 1.30 | v0.8.x | ⚠️ Use older Skyhook | K8s 1.30 EOL: June 28, 2025 |
| 1.29 and older | v0.8.x or older | ⚠️ Use older Skyhook | No longer maintained |

Expand Down Expand Up @@ -57,21 +57,21 @@ We understand many installations run slightly older Kubernetes versions. Our str

**Choose your Skyhook version based on your Kubernetes version:**

- **Kubernetes 1.33, 1.32, or 1.31:** Use latest Skyhook (v0.9.0+)
- **Kubernetes 1.34, 1.33, 1.32, or 1.31:** Use latest Skyhook (v0.9.0+)
- **Kubernetes 1.30:** Use Skyhook v0.8.x (K8s 1.30 is EOL but v0.8.x still works)
- **Kubernetes 1.29 or older:** Use Skyhook v0.8.x or older (check release notes for compatibility)

### Migration Path

**If you're on an older Kubernetes version:**
1. **First:** Upgrade your Kubernetes cluster to a supported version (1.31, 1.32, or 1.33)
1. **First:** Upgrade your Kubernetes cluster to a supported version (1.31, 1.32, 1.33, or 1.34)
2. **Then:** Upgrade to the latest Skyhook version

**If you're on Kubernetes 1.30:**
- **Option A:** Upgrade to K8s 1.31/1.32/1.33, then use latest Skyhook
- **Option A:** Upgrade to K8s 1.31/1.32/1.33/1.34, then use latest Skyhook
- **Option B:** Stay on Skyhook v0.8.x until you can upgrade Kubernetes

**Recommended:** If you can choose your Kubernetes version, use 1.33 or 1.32 for the longest support runway.
**Recommended:** If you can choose your Kubernetes version, use 1.34, 1.33, or 1.32 for the longest support runway.

## FAQ

Expand Down Expand Up @@ -102,7 +102,7 @@ Waiting 4+ weeks lets the ecosystem stabilize and gives us confidence in support
### How do you test compatibility?

For each Skyhook release, we test against all supported Kubernetes versions using:
- GitHub Actions matrix builds with multiple K8s versions (currently 1.31, 1.32, 1.33)
- GitHub Actions matrix builds with multiple K8s versions (currently 1.31, 1.32, 1.33, 1.34)
- Local testing with [kind](https://kind.sigs.k8s.io/)
- Basic functionality and integration tests

Expand Down
2 changes: 1 addition & 1 deletion operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ IMG_REPO ?= ghcr.io/nvidia/skyhook
IMG ?= $(IMG_REPO)/operator

## default version of kind to use
KIND_VERSION?=1.33.1
KIND_VERSION?=1.34.0

PLATFORM := $(shell uname -s 2>/dev/null || echo unknown)
SKYHOOK_NAMESPACE ?= skyhook
Expand Down
2 changes: 1 addition & 1 deletion operator/api/v1alpha1/webhook_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
// Note that you must have the required binaries setup under the bin directory to perform
// the tests directly. When we run make test it will be setup and used automatically.
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
fmt.Sprintf("1.33.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
fmt.Sprintf("1.34.0-%s-%s", runtime.GOOS, runtime.GOARCH)),

WebhookInstallOptions: envtest.WebhookInstallOptions{
Paths: []string{filepath.Join("..", "..", "config", "webhook")},
Expand Down
42 changes: 40 additions & 2 deletions operator/config/crd/bases/skyhook.nvidia.com_skyhooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,9 @@ spec:
in a Container.
properties:
name:
description: Name of the environment variable. Must be
a C_IDENTIFIER.
description: |-
Name of the environment variable.
May consist of any printable ASCII characters except '='.
type: string
value:
description: |-
Expand Down Expand Up @@ -298,6 +299,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
fileKeyRef:
description: |-
FileKeyRef selects a key of the env file.
Requires the EnvFiles feature gate to be enabled.
properties:
key:
description: |-
The key within the env file. An invalid key will prevent the pod from starting.
The keys defined within a source may consist of any printable ASCII characters except '='.
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
type: string
optional:
default: false
description: |-
Specify whether the file or its key must be defined. If the file or key
does not exist, then the env var is not published.
If optional is set to true and the specified key does not exist,
the environment variable will not be set in the Pod's containers.

If optional is set to false and the specified key does not exist,
an error will be returned during Pod creation.
type: boolean
path:
description: |-
The path within the volume from which to select the file.
Must be relative and may not contain the '..' path or start with '..'.
type: string
volumeName:
description: The name of the volume mount containing
the env file.
type: string
required:
- key
- path
- volumeName
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only resources limits and requests
Expand Down
2 changes: 1 addition & 1 deletion operator/deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endif
GOLANGCI_LINT_VERSION ?= v2.2.1
KUSTOMIZE_VERSION ?= v5.4.1
CONTROLLER_TOOLS_VERSION ?= v0.18.0
ENVTEST_K8S_VERSION ?= 1.33.0
ENVTEST_K8S_VERSION ?= 1.34.1
GOCOVER_VERSION ?= v1.3.0
GINKGO_VERSION ?= v2.22.2
MOCKERY_VERSION ?= v3.5.0
Expand Down
34 changes: 18 additions & 16 deletions operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,58 @@ require (
github.com/sethvargo/go-envconfig v1.0.0
github.com/stretchr/testify v1.10.0
go.uber.org/zap v1.27.0
k8s.io/api v0.33.2
k8s.io/apimachinery v0.33.2
k8s.io/client-go v0.33.2
k8s.io/kubernetes v1.33.4
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
k8s.io/kubernetes v1.34.1
sigs.k8s.io/controller-runtime v0.21.0
)

require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/sync v0.12.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.22.0
Expand All @@ -73,11 +76,10 @@ require (
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.33.0 // indirect
k8s.io/apiextensions-apiserver v0.34.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading