diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml index 55acccc467..040f1cf11f 100644 --- a/.github/workflows/olm_tests.yaml +++ b/.github/workflows/olm_tests.yaml @@ -6,7 +6,7 @@ on: pull_request: env: GO_VERSION: '1.19' - KIND_IMG_TAG: v1.26.0 + KIND_IMG_TAG: v1.26.1 permissions: {} diff --git a/api/spod/v1alpha1/spod_types.go b/api/spod/v1alpha1/spod_types.go index f2209e6ffb..b15883c0c6 100644 --- a/api/spod/v1alpha1/spod_types.go +++ b/api/spod/v1alpha1/spod_types.go @@ -312,7 +312,7 @@ type SPODSpec struct { // DaemonResourceRequirements if defined, overwrites the default resource requirements // of SPOD daemon. // +optional - DaemonResourceRequirements *corev1.ResourceRequirements `json:"daemonResourceRequirements,omitempty"` + DaemonResourceRequirements *corev1.ResourceRequirements `json:"daemonResourceRequirements"` } // SPODState defines the state that the spod is in. diff --git a/dependencies.yaml b/dependencies.yaml index 2fe5b87479..44e300aff6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -64,7 +64,7 @@ dependencies: match: kindVersion - name: kind-image - version: 1.26.0 + version: 1.26.1 refPaths: - path: test/suite_test.go match: kindImage @@ -78,7 +78,7 @@ dependencies: match: QEMUVERSION - name: e2e-kubernetes - version: 1.26.0 + version: 1.26.1 refPaths: - path: hack/ci/install-kubernetes.sh match: VERSION diff --git a/hack/ci/Vagrantfile-ubuntu b/hack/ci/Vagrantfile-ubuntu index a077658827..f65701a7ca 100644 --- a/hack/ci/Vagrantfile-ubuntu +++ b/hack/ci/Vagrantfile-ubuntu @@ -33,7 +33,7 @@ Vagrant.configure("2") do |config| curl -sSfL https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list apt-get update - KUBERNETES_VERSION=1.26.0-00 + KUBERNETES_VERSION=1.26.1-00 apt-get install -y \ build-essential \ kubelet=$KUBERNETES_VERSION \ diff --git a/hack/ci/install-kubernetes.sh b/hack/ci/install-kubernetes.sh index fd3b070458..3529219d34 100755 --- a/hack/ci/install-kubernetes.sh +++ b/hack/ci/install-kubernetes.sh @@ -19,7 +19,7 @@ ENVFILE=$(dirname "${BASH_SOURCE[0]}")/env-fedora.sh . "$ENVFILE" K8SPATH="$GOPATH/src/k8s.io" -VERSION=v1.26.0 +VERSION=v1.26.1 download-kubernetes() { export KUBERNETES_RELEASE=$VERSION diff --git a/test/suite_test.go b/test/suite_test.go index fa91cdf2f3..74a93723a7 100644 --- a/test/suite_test.go +++ b/test/suite_test.go @@ -40,7 +40,7 @@ import ( const ( kindVersion = "v0.17.0" - kindImage = "kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352" + kindImage = "kindest/node:v1.26.1@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352" kindDarwinSHA512 = "40ebb37b74b88d71854f73bc8d505e5cfb7ad14952657f0f9f46605632f2611277d09e8b00d05e95d10f913bd31d816131a3e26e7f34a6f2e50297d146f15050" //nolint:lll // full length SHA kindLinuxSHA512 = "ae9b8ad431157c47bd034552e6b1656e46aa4033e96f25d5ff5d539308f17b2b003d25e02656f461d3eeed4e3ba0507b8523f6fa9180b59f37a5f083f62e5560" //nolint:lll // full length SHA )