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 6, 2024
1 parent 7a56e5d commit 32308f1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
15 changes: 8 additions & 7 deletions build-scripts/patches/moonray/0001-Moonray.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 1a16f5952ebda874a37556cfdca410a8e7e00ae6 Mon Sep 17 00:00:00 2001
From: Benjamin Schimke <benjamin.schimke@canonical.com>
Date: Wed, 5 Jun 2024 09:48:57 +0200
From 4f26e12832ef73b5c76a59cf3209d4f1f5b0aa3b Mon Sep 17 00:00:00 2001
From: k8s-bot <k8s-bot@canonical.com>
Date: Thu, 6 Jun 2024 10:34:52 +0200
Subject: [PATCH] Moonray

---
Expand All @@ -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

5 changes: 3 additions & 2 deletions src/k8s/pkg/k8sd/features/implementation_moonray.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand All @@ -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,
}

0 comments on commit 32308f1

Please sign in to comment.