Skip to content

Commit

Permalink
Make DaemonResourceRequirements non omitempty
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert committed Jan 19, 2023
1 parent ef75f5b commit 5f05024
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/olm_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

Expand Down
2 changes: 1 addition & 1 deletion api/spod/v1alpha1/spod_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/Vagrantfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/install-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down

0 comments on commit 5f05024

Please sign in to comment.