Merge pull request #22 from telekom/fix/gh-actions

Add PR Workflow

.github/workflows/container-image.yaml

@@ -18,7 +18,7 @@ jobs:
           go-version: "^1.18"
 
       - name: Install packages
-        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev libbpf-dev linux-headers-generic-hwe-20.04
+        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
 
       - name: Build
         run: |

.github/workflows/draft_release.yaml

@@ -20,7 +20,7 @@ jobs:
           go-version: "^1.18"
 
       - name: Install packages
-        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev libbpf-dev linux-headers-generic-hwe-20.04
+        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
 
       - name: Build
         run: |
@@ -49,7 +49,7 @@ jobs:
           go-version: "^1.18"
 
       - name: Install packages
-        run: sudo apt-get update && apt-get install -y llvm clang libbpf-dev libbpf-dev linux-headers-generic-hwe-20.04
+        run: sudo apt-get update && apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
 
       - name: Build
         run: |

.github/workflows/pullrequests.yaml

@@ -0,0 +1,55 @@
+name: pullrequests
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+permissions: {}
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.19
+      - name: Install packages
+        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
+      - name: run code generators
+        run: make generate
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3.6.0
+        with:
+          version: v1.48.0
+
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.19
+      - name: Install packages
+        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
+      - name: Run Tests
+        run: make test
+
+  validate-generated:
+    name: validate generated files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.19
+      - name: Install packages
+        run: sudo apt-get update && sudo apt-get install -y llvm clang libbpf-dev gcc-multilib linux-headers-$(uname -r)
+      - name: run code generators
+        run: make generate
+      - name: run manifest generators
+        run: make manifests
+      - name: ensure no files changed
+        run: git diff --exit-code || (echo "Generated files are out of sync. Please run 'make generate manifests' and commit the updated files."; exit 1)

api/v1alpha1/webhook_suite_test.go

@@ -71,7 +71,8 @@ var _ = BeforeSuite(func() {
 		},
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 

config/crd/bases/network.schiff.telekom.de_layer2networkconfigurations.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: layer2networkconfigurations.network.schiff.telekom.de
 spec:
   group: network.schiff.telekom.de
@@ -108,6 +106,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               vni:
                 description: VXLAN VNI Id for the layer 2 network
                 type: integer
@@ -128,9 +127,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/crd/bases/network.schiff.telekom.de_vrfrouteconfigurations.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: vrfrouteconfigurations.network.schiff.telekom.de
 spec:
   group: network.schiff.telekom.de
@@ -133,9 +131,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/rbac/role.yaml

@@ -1,9 +1,7 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

config/webhook/manifests.yaml

@@ -1,9 +1,7 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:

controllers/suite_test.go

@@ -58,7 +58,8 @@ var _ = BeforeSuite(func() {
 		ErrorIfCRDPathMissing: true,
 	}
 
-	cfg, err := testEnv.Start()
+	var err error
+	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 

controllers/vrfrouteconfiguration_controller.go

@@ -187,7 +187,10 @@ func (r *VRFRouteConfigurationReconciler) ReconcileDebounced(ctx context.Context
 	// Make sure that all created netlink VRFs are up after FRR reload
 	time.Sleep(2 * time.Second)
 	for _, info := range created {
-		r.NLManager.UpL3(info)
+		if err := r.NLManager.UpL3(info); err != nil {
+			r.Logger.Error(err, "error setting L3 to state UP")
+			return err
+		}
 	}
 	return nil
 }

pkg/anycast/anycast.go

@@ -33,23 +33,9 @@ func (a *AnycastTracker) checkTrackedInterfaces() {
 	}
 }
 
-func createNeighborEntry(mac net.HardwareAddr, intf, master int) *netlink.Neigh {
-	return &netlink.Neigh{
-		State:        netlink.NUD_NOARP,
-		Family:       unix.AF_BRIDGE,
-		HardwareAddr: mac,
-		LinkIndex:    intf,
-		MasterIndex:  master,
-	}
-}
-
-func isUnicastMac(mac net.HardwareAddr) bool {
-	return mac[0]&0x01 == 0
-}
-
 func containsIPNetwork(list []*net.IPNet, dst *net.IPNet) bool {
 	for _, v := range list {
-		if bytes.Equal(v.IP, dst.IP) && bytes.Equal(v.Mask, dst.Mask) {
+		if net.IP.Equal(v.IP, dst.IP) && bytes.Equal(v.Mask, dst.Mask) {
 			return true
 		}
 	}
@@ -58,7 +44,7 @@ func containsIPNetwork(list []*net.IPNet, dst *net.IPNet) bool {
 
 func containsIPAddress(list []netlink.Neigh, dst *net.IPNet) bool {
 	for _, v := range list {
-		if bytes.Equal(v.IP, dst.IP) {
+		if net.IP.Equal(v.IP, dst.IP) {
 			return true
 		}
 	}
@@ -114,7 +100,9 @@ func syncInterfaceByFamily(intf *netlink.Bridge, family int, routingTable uint32
 	alreadyV4Existing := []*net.IPNet{}
 	for _, route := range routes {
 		if !containsIPAddress(bridgeNeighbors, route.Dst) {
-			netlink.RouteDel(&route)
+			if err := netlink.RouteDel(&route); err != nil {
+				fmt.Printf("Error deleting route %v: %v\n", route, err)
+			}
 		} else {
 			alreadyV4Existing = append(alreadyV4Existing, route.Dst)
 		}
@@ -123,7 +111,10 @@ func syncInterfaceByFamily(intf *netlink.Bridge, family int, routingTable uint32
 	for _, neighbor := range bridgeNeighbors {
 		net := netlink.NewIPNet(neighbor.IP)
 		if !containsIPNetwork(alreadyV4Existing, net) {
-			netlink.RouteAdd(buildRoute(family, intf, net, routingTable))
+			route := buildRoute(family, intf, net, routingTable)
+			if err := netlink.RouteAdd(route); err != nil {
+				fmt.Printf("Error adding route %v: %v\n", route, err)
+			}
 		}
 	}
 }

pkg/config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"io/ioutil"
 	"os"
 
 	"gopkg.in/yaml.v2"
@@ -33,7 +32,7 @@ func LoadConfig() (*Config, error) {
 		vniFile = val
 	}
 
-	read, err := ioutil.ReadFile(vniFile)
+	read, err := os.ReadFile(vniFile)
 	if err != nil {
 		return nil, err
 	}

pkg/frr/configure.go

@@ -2,7 +2,6 @@ package frr
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 
 	"github.com/telekom/das-schiff-network-operator/pkg/nl"
@@ -32,7 +31,7 @@ func (m *FRRManager) Configure(in FRRConfiguration) (bool, error) {
 		return false, err
 	}
 
-	currentConfig, err := ioutil.ReadFile(m.ConfigPath)
+	currentConfig, err := os.ReadFile(m.ConfigPath)
 	if err != nil {
 		return false, err
 	}
@@ -42,8 +41,8 @@ func (m *FRRManager) Configure(in FRRConfiguration) (bool, error) {
 		return false, err
 	}
 
-	if bytes.Compare(currentConfig, targetConfig) != 0 {
-		err = ioutil.WriteFile(m.ConfigPath, targetConfig, FRR_PERMISSIONS)
+	if bytes.Equal(currentConfig, targetConfig) {
+		err = os.WriteFile(m.ConfigPath, targetConfig, FRR_PERMISSIONS)
 		if err != nil {
 			return false, err
 		}

pkg/frr/manager.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"io/fs"
-	"io/ioutil"
 	"net"
 	"os"
 	"text/template"
@@ -69,7 +68,7 @@ func (m *FRRManager) Init() error {
 		}
 	}
 
-	bytes, err := ioutil.ReadFile(m.TemplatePath)
+	bytes, err := os.ReadFile(m.TemplatePath)
 	if err != nil {
 		return err
 	}

pkg/frr/templates.go

@@ -2,9 +2,9 @@ package frr
 
 import (
 	_ "embed"
+	"os"
 
 	"bytes"
-	"io/ioutil"
 	"regexp"
 	"text/template"
 )
@@ -78,7 +78,7 @@ func render(tpl *template.Template, vrfs interface{}) ([]byte, error) {
 }
 
 func generateTemplateConfig(template string, original string) error {
-	bytes, err := ioutil.ReadFile(original)
+	bytes, err := os.ReadFile(original)
 	if err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func generateTemplateConfig(template string, original string) error {
 	commentToRemove := regexp.MustCompile(`(?m)^\#\+\+`)
 	content = commentToRemove.ReplaceAllString(content, "")
 
-	err = ioutil.WriteFile(template, []byte(content), FRR_PERMISSIONS)
+	err = os.WriteFile(template, []byte(content), FRR_PERMISSIONS)
 	if err != nil {
 		return err
 	}