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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/cli-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- cli/*

env:
GO_VERSION: 1.24.6
GO_VERSION: 1.25.5

jobs:
release:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/operator-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
GO_VERSION: 1.24.6
GO_VERSION: 1.25.5
PLATFORMS: linux/amd64,linux/arm64

jobs:
Expand All @@ -53,16 +53,16 @@ jobs:
strategy:
matrix:
# Standard E2E tests on all supported K8s versions
k8s-version: ["1.31.12", "1.32.8", "1.33.4", "1.34.0"]
k8s-version: ["1.31.14", "1.32.11", "1.33.7", "1.34.3", "1.35.0"]
test-suite: ["e2e"]
include:
# Deployment policy tests on 15-node cluster (K8s 1.34 only)
- k8s-version: "1.34.0"
- k8s-version: "1.35.0"
test-suite: deployment-policy
kind-config: k8s-tests/chainsaw/deployment-policy/kind-config.yaml
make-target: deployment-policy-tests
# CLI e2e tests on K8s 1.34 only
- k8s-version: "1.34.0"
- k8s-version: "1.35.0"
test-suite: cli-e2e
make-target: cli-e2e-tests
fail-fast: false # Continue testing other versions if one fails
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
fi
# Upload coverage to Coveralls using goveralls (Go-specific tool)
- name: Upload coverage to Coveralls
if: matrix.test-suite == 'e2e' && matrix.k8s-version == '1.34.0'
if: matrix.test-suite == 'e2e' && matrix.k8s-version == '1.35.0'
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion docs/kubernetes-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ This document outlines Skyhook's approach to supporting different Kubernetes ver

| Kubernetes Version | Skyhook Version | Status | Notes |
|--------------------|-----------------|---------|-------|
| 1.34, 1.33, 1.32, 1.31 | v0.9.0+ | ✅ Fully Supported | Current stable versions |
| 1.35, 1.34, 1.33, 1.32, 1.31 | v0.11.0+ | ✅ Next Supported | Current stable versions |
| 1.34, 1.33, 1.32, 1.31 | v0.9.0 - 0.10.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
4 changes: 2 additions & 2 deletions operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ include deps.mk

## Version of the operator
VERSION ?= $(GIT_TAG_LAST)
GO_VERSION ?= 1.24.6
GO_VERSION ?= 1.25.5

# Image URL to use all building/pushing image
## TODO: update this to the correct image location
IMG_REPO ?= ghcr.io/nvidia/skyhook
IMG ?= $(IMG_REPO)/operator

## default version of kind to use
KIND_VERSION?=1.34.0
KIND_VERSION?=1.35.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.34.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
fmt.Sprintf("1.35.0-%s-%s", runtime.GOOS, runtime.GOARCH)),

WebhookInstallOptions: envtest.WebhookInstallOptions{
Paths: []string{filepath.Join("..", "..", "config", "webhook")},
Expand Down
4 changes: 2 additions & 2 deletions operator/api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion operator/cmd/cli/app/node/node_ignore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ var _ = Describe("Node Ignore Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
mockKube = fake.NewSimpleClientset()
mockKube = fake.NewClientset()
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))

Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/node/node_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var _ = Describe("Node List Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
mockKube = fake.NewSimpleClientset()
mockKube = fake.NewClientset()
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
})
Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/node/node_reset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ var _ = Describe("Node Reset Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
mockKube = fake.NewSimpleClientset()
mockKube = fake.NewClientset()
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))

Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/node/node_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ var _ = Describe("Node Status Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
mockKube = fake.NewSimpleClientset()
mockKube = fake.NewClientset()
kubeClient = client.NewWithClientsAndConfig(mockKube, nil, nil)
cliCtx = context.NewCLIContext(context.NewCLIConfig(context.WithOutputWriter(output)))
})
Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/package/package_logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ var _ = Describe("Package Logs Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
fakeKube = fake.NewSimpleClientset()
fakeKube = fake.NewClientset()
kubeClient = client.NewWithClientsAndConfig(fakeKube, nil, nil)
})

Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/package/package_rerun_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ var _ = Describe("Package Rerun Command", func() {
)

BeforeEach(func() {
fakeKube = fake.NewSimpleClientset()
fakeKube = fake.NewClientset()
mockDynamic = &mockdynamic.Interface{}
mockNSRes = &mockdynamic.NamespaceableResourceInterface{}
kubeClient = client.NewWithClientsAndConfig(fakeKube, mockDynamic, nil)
Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/package/package_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ var _ = Describe("Package Status Command", func() {

BeforeEach(func() {
output = &bytes.Buffer{}
fakeKube = fake.NewSimpleClientset()
fakeKube = fake.NewClientset()
mockDynamic = &mockdynamic.Interface{}
mockNSRes = &mockdynamic.NamespaceableResourceInterface{}
kubeClient = client.NewWithClientsAndConfig(fakeKube, mockDynamic, nil)
Expand Down
2 changes: 1 addition & 1 deletion operator/cmd/cli/app/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func TestDiscoverOperatorVersion(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
clientset := fake.NewSimpleClientset()
clientset := fake.NewClientset()

if tt.deployment != nil {
_, err := clientset.AppsV1().Deployments("skyhook").Create(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ spec:
operator:
description: |-
Operator represents a key's relationship to the value.
Valid operators are Exists and Equal. Defaults to Equal.
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
Exists is equivalent to wildcard for value, so that a pod can
tolerate all taints of a particular category.
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
type: string
tolerationSeconds:
description: |-
Expand Down
10 changes: 5 additions & 5 deletions operator/deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ ifndef ARCH
endif

## versions
GOLANGCI_LINT_VERSION ?= v2.2.1
GOLANGCI_LINT_VERSION ?= v2.7.2
KUSTOMIZE_VERSION ?= v5.4.1
CONTROLLER_TOOLS_VERSION ?= v0.18.0
ENVTEST_K8S_VERSION ?= 1.34.1
GOCOVER_VERSION ?= v1.3.0
GINKGO_VERSION ?= v2.22.2
ENVTEST_K8S_VERSION ?= 1.35.0
GOCOVER_VERSION ?= v1.4.0
GINKGO_VERSION ?= v2.27.2
MOCKERY_VERSION ?= v3.5.0
CHAINSAW_VERSION ?= v0.2.10
HELM_VERSION ?= v3.18.5
Expand Down Expand Up @@ -93,7 +93,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.20 ## latest requires golang 1.24
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22
$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN)

.PHONY: gocover-cobertura
Expand Down
64 changes: 31 additions & 33 deletions operator/go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
module github.com/NVIDIA/skyhook/operator

go 1.24.0

toolchain go1.24.6
go 1.25.5

require (
github.com/go-logr/logr v1.4.2
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/go-logr/logr v1.4.3
github.com/onsi/ginkgo/v2 v2.27.2
github.com/onsi/gomega v1.38.2
github.com/sethvargo/go-envconfig v1.0.0
github.com/spf13/cobra v1.10.1
github.com/stretchr/testify v1.10.0
github.com/stretchr/testify v1.11.1
go.uber.org/zap v1.27.0
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/cli-runtime v0.34.1
k8s.io/client-go v0.34.1
k8s.io/kubernetes v1.34.2
sigs.k8s.io/controller-runtime v0.21.0
k8s.io/api v0.35.0
k8s.io/apimachinery v0.35.0
k8s.io/cli-runtime v0.35.0
k8s.io/client-go v0.35.0
k8s.io/kubernetes v1.35.0
sigs.k8s.io/controller-runtime v0.22.4
)

require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
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.9.0 // indirect
Expand All @@ -36,10 +35,10 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v2 v2.4.3 // 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
golang.org/x/sync v0.18.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/kustomize/api v0.20.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
Expand All @@ -61,38 +60,37 @@ require (
github.com/gogo/protobuf v1.3.2 // 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/pprof v0.0.0-20250403155104-27863c87afa6 // 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.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/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/spf13/pflag v1.0.9
github.com/stretchr/objx v0.5.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.22.0
golang.org/x/net v0.38.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/mod v0.29.0
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.org/x/tools v0.38.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
google.golang.org/protobuf v1.36.8 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.34.1 // indirect
k8s.io/klog/v2 v2.130.1 // 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
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/yaml v1.6.0
)
Loading