Add networking-calico and networking-cilium components (#56)

* Add networking-calico extension

* Add networking-cilium extension

* drop obsolete version file

* address review feedback

Author: MartinWeindel

componentvector/components.go

@@ -2,3 +2,9 @@ components:
 - name: github.com/gardener/gardener
   sourceRepository: https://github.com/gardener/gardener
   version: v1.134.1
+- name: github.com/gardener/gardener-extension-networking-calico
+  sourceRepository: https://github.com/gardener/gardener-extension-networking-calico
+  version: v1.54.0
+- name: github.com/gardener/gardener-extension-networking-cilium
+  sourceRepository: https://github.com/gardener/gardener-extension-networking-cilium
+  version: v1.45.2

componentvector/components.yaml

@@ -0,0 +1,100 @@
+// SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package networking_calico
+
+import (
+	"embed"
+	"path"
+
+	"github.com/gardener/gardener-landscape-kit/componentvector"
+	"github.com/gardener/gardener-landscape-kit/pkg/components"
+	"github.com/gardener/gardener-landscape-kit/pkg/utils/files"
+)
+
+const (
+	// ComponentDirectory is the garden component directory within the base components directory.
+	ComponentDirectory = "gardener-extensions/networking-calico"
+)
+
+var (
+	// baseTemplateDir is the directory where the base templates are stored.
+	baseTemplateDir = "templates/base"
+	//go:embed templates/base
+	baseTemplates embed.FS
+
+	// landscapeTemplateDir is the directory where the landscape templates are stored.
+	landscapeTemplateDir = "templates/landscape"
+	//go:embed templates/landscape
+	landscapeTemplates embed.FS
+)
+
+type component struct{}
+
+// NewComponent creates a new garden component.
+func NewComponent() components.Interface {
+	return &component{}
+}
+
+// Name returns the component name.
+func (c *component) Name() string {
+	return "networking-calico"
+}
+
+// GenerateBase generates the component base directory.
+func (c *component) GenerateBase(options components.Options) error {
+	for _, op := range []func(components.Options) error{
+		writeBaseTemplateFiles,
+	} {
+		if err := op(options); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// GenerateLandscape generates the component landscape directory.
+func (c *component) GenerateLandscape(options components.LandscapeOptions) error {
+	for _, op := range []func(components.LandscapeOptions) error{
+		writeLandscapeTemplateFiles,
+	} {
+		if err := op(options); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func writeBaseTemplateFiles(opts components.Options) error {
+	version, exists := opts.GetComponentVector().FindComponentVersion(componentvector.NameGardenerGardenerExtensionNetworkingCalico)
+	if !exists {
+		opts.GetLogger().Info("Component version not found in component vector, falling back to empty version", "component", componentvector.NameGardenerGardenerExtensionNetworkingCalico)
+	}
+
+	objects, err := files.RenderTemplateFiles(baseTemplates, baseTemplateDir, map[string]any{
+		"version": version,
+	})
+	if err != nil {
+		return err
+	}
+
+	return files.WriteObjectsToFilesystem(objects, opts.GetTargetPath(), path.Join(components.DirName, ComponentDirectory), opts.GetFilesystem())
+}
+
+func writeLandscapeTemplateFiles(opts components.LandscapeOptions) error {
+	var (
+		relativeComponentPath = path.Join(components.DirName, ComponentDirectory)
+		relativeRepoRoot      = files.CalculatePathToComponentBase(opts.GetRelativeLandscapePath(), relativeComponentPath)
+	)
+
+	objects, err := files.RenderTemplateFiles(landscapeTemplates, landscapeTemplateDir, map[string]any{
+		"relativePathToBaseComponent": path.Join(relativeRepoRoot, opts.GetRelativeBasePath(), relativeComponentPath),
+		"landscapeComponentPath":      path.Join(opts.GetRelativeLandscapePath(), relativeComponentPath),
+	})
+	if err != nil {
+		return err
+	}
+
+	return files.WriteObjectsToFilesystem(objects, opts.GetTargetPath(), path.Join(components.DirName, ComponentDirectory), opts.GetFilesystem())
+}

pkg/components/gardener-extensions/networking-calico/component.go

@@ -0,0 +1,87 @@
+// SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package networking_calico_test
+
+import (
+	"github.com/go-logr/logr"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/spf13/afero"
+
+	"github.com/gardener/gardener-landscape-kit/pkg/apis/config/v1alpha1"
+	"github.com/gardener/gardener-landscape-kit/pkg/cmd"
+	generateoptions "github.com/gardener/gardener-landscape-kit/pkg/cmd/generate/options"
+	"github.com/gardener/gardener-landscape-kit/pkg/components"
+	networking_calico "github.com/gardener/gardener-landscape-kit/pkg/components/gardener-extensions/networking-calico"
+)
+
+var _ = Describe("Component Generation", func() {
+	var (
+		fs           afero.Afero
+		cmdOpts      *cmd.Options
+		generateOpts *generateoptions.Options
+	)
+
+	BeforeEach(func() {
+		fs = afero.Afero{Fs: afero.NewMemMapFs()}
+		cmdOpts = &cmd.Options{Log: logr.Discard()}
+		generateOpts = &generateoptions.Options{
+			TargetDirPath: "/repo/baseDir",
+			Options:       cmdOpts,
+		}
+	})
+
+	Describe("#GenerateBase", func() {
+		var opts components.Options
+
+		BeforeEach(func() {
+			var err error
+			opts, err = components.NewOptions(generateOpts, fs)
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("should generate the component base", func() {
+			component := networking_calico.NewComponent()
+			Expect(component.GenerateBase(opts)).To(Succeed())
+
+			content, err := fs.ReadFile("/repo/baseDir/components/gardener-extensions/networking-calico/extension.yaml")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(string(content)).To(ContainSubstring("apiVersion: operator.gardener.cloud/v1alpha1"))
+			Expect(string(content)).To(ContainSubstring("kind: Extension"))
+
+			content, err = fs.ReadFile("/repo/baseDir/components/gardener-extensions/networking-calico/kustomization.yaml")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(string(content)).To(ContainSubstring("- extension.yaml"))
+		})
+	})
+
+	Describe("#GenerateLandscape", func() {
+		BeforeEach(func() {
+			generateOpts.TargetDirPath = "/repo/landscapeDir"
+			generateOpts.Config = &v1alpha1.LandscapeKitConfiguration{
+				Git: &v1alpha1.GitRepository{Paths: v1alpha1.PathConfiguration{Landscape: "./landscapeDir", Base: "./baseDir"}},
+			}
+		})
+
+		It("should generate only the flux kustomization into the landscape dir", func() {
+			component := networking_calico.NewComponent()
+			landscapeOpts, err := components.NewLandscapeOptions(generateOpts, fs)
+			Expect(component.GenerateLandscape(landscapeOpts)).To(Succeed())
+			Expect(err).ToNot(HaveOccurred())
+
+			exists, err := fs.DirExists("/repo/baseDir")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(exists).To(BeFalse())
+
+			content, err := fs.ReadFile("/repo/landscapeDir/components/gardener-extensions/networking-calico/flux-kustomization.yaml")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(string(content)).To(ContainSubstring("path: landscapeDir/components/gardener-extensions/networking-calico"))
+
+			content, err = fs.ReadFile("/repo/landscapeDir/components/gardener-extensions/networking-calico/kustomization.yaml")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(string(content)).To(ContainSubstring("- ../../../../baseDir/components/gardener-extensions/networking-calico"))
+		})
+	})
+})

pkg/components/gardener-extensions/networking-calico/component_test.go

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: SAP SE or an SAP affiliate company and Gardener contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package networking_calico_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestNetworkingCalico(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Components Networking Calico Suite")
+}

pkg/components/gardener-extensions/networking-calico/networking_calico_suite_test.go

@@ -0,0 +1,24 @@
+apiVersion: operator.gardener.cloud/v1alpha1
+kind: Extension
+metadata:
+  annotations:
+    security.gardener.cloud/pod-security-enforce: baseline
+  name: networking-calico
+spec:
+  deployment:
+    admission:
+      runtimeCluster:
+        helm:
+          ociRepository:
+            ref: europe-docker.pkg.dev/gardener-project/public/charts/gardener/extensions/admission-calico-runtime:{{ .version }}
+      virtualCluster:
+        helm:
+          ociRepository:
+            ref: europe-docker.pkg.dev/gardener-project/public/charts/gardener/extensions/admission-calico-application:{{ .version }}
+    extension:
+      helm:
+        ociRepository:
+          ref: europe-docker.pkg.dev/gardener-project/public/charts/gardener/extensions/networking-calico:{{ .version }}
+  resources:
+  - kind: Network
+    type: calico

pkg/components/gardener-extensions/networking-calico/templates/base/extension.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- extension.yaml

pkg/components/gardener-extensions/networking-calico/templates/base/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: operator.gardener.cloud/v1alpha1
+kind: Extension
+metadata:
+  name: networking-calico
+spec:
+  deployment:
+    admission:
+      values:
+    extension:
+      values:

pkg/components/gardener-extensions/networking-calico/templates/landscape/extension.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: extension-networking-calico
+  namespace: garden
+spec:
+  interval: 30m
+  path: {{ .landscapeComponentPath }}
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  dependsOn:
+  - name: gardener-operator
+    namespace: garden

pkg/components/gardener-extensions/networking-calico/templates/landscape/flux-kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- {{ .relativePathToBaseComponent }}
+patches:
+- path: extension.yaml