diff --git a/build-scripts/patches/moonray/0001-Moonray.patch b/build-scripts/patches/moonray/0001-Moonray.patch index 4dfd87126..8bceec131 100644 --- a/build-scripts/patches/moonray/0001-Moonray.patch +++ b/build-scripts/patches/moonray/0001-Moonray.patch @@ -1,6 +1,6 @@ -From 1a16f5952ebda874a37556cfdca410a8e7e00ae6 Mon Sep 17 00:00:00 2001 -From: Benjamin Schimke -Date: Wed, 5 Jun 2024 09:48:57 +0200 +From 4f26e12832ef73b5c76a59cf3209d4f1f5b0aa3b Mon Sep 17 00:00:00 2001 +From: k8s-bot +Date: Thu, 6 Jun 2024 10:34:52 +0200 Subject: [PATCH] Moonray --- @@ -16,17 +16,18 @@ index aeb1729..184f2ce 100644 +//go:build ignore + package features - + import ( diff --git a/src/k8s/pkg/k8sd/features/implementation_moonray.go b/src/k8s/pkg/k8sd/features/implementation_moonray.go -index f8abf25..cdf39fa 100644 +index dece19d..5933221 100644 --- a/src/k8s/pkg/k8sd/features/implementation_moonray.go +++ b/src/k8s/pkg/k8sd/features/implementation_moonray.go @@ -1,5 +1,3 @@ -//go:build ignore - package features - + import ( --- +-- 2.34.1 + diff --git a/src/k8s/pkg/k8sd/features/implementation_moonray.go b/src/k8s/pkg/k8sd/features/implementation_moonray.go index f8abf250d..dece19d01 100644 --- a/src/k8s/pkg/k8sd/features/implementation_moonray.go +++ b/src/k8s/pkg/k8sd/features/implementation_moonray.go @@ -3,6 +3,7 @@ package features import ( + "github.com/canonical/k8s/pkg/k8sd/features/calico" "github.com/canonical/k8s/pkg/k8sd/features/cilium" "github.com/canonical/k8s/pkg/k8sd/features/coredns" "github.com/canonical/k8s/pkg/k8sd/features/localpv" @@ -13,7 +14,7 @@ import ( // TODO: Replace default by moonray. var Implementation Interface = &implementation{ applyDNS: coredns.ApplyDNS, - applyNetwork: cilium.ApplyNetwork, + applyNetwork: calico.ApplyNetwork, applyLoadBalancer: cilium.ApplyLoadBalancer, applyIngress: cilium.ApplyIngress, applyGateway: cilium.ApplyGateway, @@ -24,6 +25,6 @@ var Implementation Interface = &implementation{ // StatusChecks implements the Canonical Kubernetes moonray feature status checks. // TODO: Replace default by moonray. var StatusChecks StatusInterface = &statusChecks{ - checkNetwork: cilium.CheckNetwork, + checkNetwork: calico.CheckNetwork, checkDNS: coredns.CheckDNS, }