Skip to content

Commit

Permalink
update moonray patch
Browse files Browse the repository at this point in the history
  • Loading branch information
k8s-bot committed Jun 5, 2024
1 parent b2dd7c3 commit fe7bc8b
Showing 1 changed file with 26 additions and 9 deletions.
35 changes: 26 additions & 9 deletions build-scripts/patches/moonray/0001-Moonray.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,41 @@
From de526e476d051fbc5ec4cfbec383a60729434159 Mon Sep 17 00:00:00 2001
From 0c5a263195e7d3ee96490a82d0fd1b65dd6859aa Mon Sep 17 00:00:00 2001
From: Benjamin Schimke <[email protected]>
Date: Wed, 5 Jun 2024 09:48:57 +0200
Subject: [PATCH] Moonray

---
src/k8s/pkg/k8sd/features/implementation_default.go | 1 +
1 file changed, 1 insertion(+)
src/k8s/pkg/k8sd/features/implementation_default.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/k8s/pkg/k8sd/features/implementation_default.go b/src/k8s/pkg/k8sd/features/implementation_default.go
index aac2d97..313a7f5 100644
index aeb1729..f945d7a 100644
--- a/src/k8s/pkg/k8sd/features/implementation_default.go
+++ b/src/k8s/pkg/k8sd/features/implementation_default.go
@@ -12,6 +12,7 @@ import (
// CoreDNS is used for DNS.
// MetricsServer is used for metrics-server.
@@ -1,6 +1,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"
@@ -14,7 +15,7 @@ import (
// LocalPV Rawfile CSI is used for local-storage.
+// TODO: Replace with moonray specific implementation.
var Implementation Interface = &implementation{
applyDNS: coredns.ApplyDNS,
applyNetwork: cilium.ApplyNetwork,
- 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 built-in feature status checks.
var StatusChecks StatusInterface = &statusChecks{
- checkNetwork: cilium.CheckNetwork,
+ checkNetwork: calico.CheckNetwork,
checkDNS: coredns.CheckDNS,
}
--
2.34.1

0 comments on commit fe7bc8b

Please sign in to comment.