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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ on:
- 'docs/**'
- '**/*.md'
pull_request:
types:
- labeled
paths-ignore:
- 'docs/**'
- '**/*.md'
types: [labeled, unlabeled, opened, synchronize, reopened]

jobs:
buildAndPush:
Expand All @@ -32,8 +31,8 @@ jobs:
target: apinetlet-manager
- name: metalnetlet
target: metalnetlet-manager
if: ${{ github.event.label.name == 'ok-to-image' }} || ${{ github.event.label.name == 'ok-to-🐳' }} || ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'ok-to-image')
steps:
- uses: actions/checkout@v4
- uses: docker/metadata-action@v5
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ METALNETLET_IMG ?= metalnetlet:latest
KIND_CLUSTER_NAME ?= kind

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.31
ENVTEST_K8S_VERSION = 1.32

# Docker image name for the mkdocs based local development setup
IMAGE=ironcore-net/documentation
Expand Down Expand Up @@ -346,12 +346,13 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
## Tool Versions
KUSTOMIZE_VERSION ?= v5.1.1
VGOPATH_VERSION ?= v0.1.5
CONTROLLER_TOOLS_VERSION ?= v0.16.0
CONTROLLER_TOOLS_VERSION ?= v0.17.2
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
ADDLICENSE_VERSION ?= v1.1.1
GOIMPORTS_VERSION ?= v0.25.0
GOIMPORTS_VERSION ?= v0.31.0
GOLANGCI_LINT_VERSION ?= v2.0
OPENAPI_EXTRACTOR_VERSION ?= v0.1.9
SETUP_ENVTEST_VERSION ?= release-0.20

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down Expand Up @@ -388,7 +389,7 @@ $(VGOPATH): $(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@latest
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)

.PHONY: openapi-extractor
openapi-extractor: $(OPENAPI_EXTRACTOR) ## Download openapi-extractor locally if necessary.
Expand Down
4 changes: 2 additions & 2 deletions apinetlet/controllers/controllers_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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.31.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
}
testEnvExt = &envtestutils.EnvironmentExtensions{
APIServiceDirectoryPaths: []string{
Expand Down Expand Up @@ -140,7 +140,7 @@ var _ = BeforeSuite(func() {
Expect(ironcoreAPISrv.Start()).To(Succeed())
DeferCleanup(ironcoreAPISrv.Stop)

Expect(envtestutils.WaitUntilAPIServicesReadyWithTimeout(apiServiceTimeout, testEnvExt, k8sClient, scheme.Scheme)).To(Succeed())
Expect(envtestutils.WaitUntilAPIServicesReadyWithTimeout(apiServiceTimeout, testEnvExt, cfg, k8sClient, scheme.Scheme)).To(Succeed())
})

func SetupTest(apiNetNamespace *corev1.Namespace) *corev1.Namespace {
Expand Down
40 changes: 20 additions & 20 deletions client-go/applyconfigurations/core/v1alpha1/daemonset.go

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

40 changes: 20 additions & 20 deletions client-go/applyconfigurations/core/v1alpha1/instance.go

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

Loading
Loading