Merge branch 'release/v2.0.0' into main

CHANGELOG.md

@@ -7,6 +7,15 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v2.0.0] - 2024-08-02
+**Breaking Change ahead**
+### Removed
+- [#94] Remove internal ETCD
+
+### Changed
+- [#94] Add k8s-registry lib in version 0.2.0 to use config maps for configuration instead of the etcd.
+  - This change requires all other installed components to use the configmaps or otherwise the setup won't succeed
+
 ## [v1.0.1] - 2024-06-18
 ### Changed
 - [#92] The setup doesn't delete its own helm secret anymore. With this behaviour terraform state mechanism is able to recognize if a setup was already applied in a cluster.

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.1 AS builder
+FROM golang:1.22.5 AS builder
 
 WORKDIR /workspace
 
@@ -30,7 +30,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="[email protected]" \
       NAME="k8s-ces-setup" \
-      VERSION="1.0.1"
+      VERSION="2.0.0"
 
 WORKDIR /
 

Jenkinsfile

@@ -103,7 +103,6 @@ node('docker') {
                 k3d.configureSetupImage(cessetupImageName)
                 k3d.configureComponents(["k8s-dogu-operator"    : ["version": "latest", "helmRepositoryNamespace": "k8s"],
                                          "k8s-dogu-operator-crd": ["version": "latest", "helmRepositoryNamespace": "k8s"],
-                                         "k8s-etcd"             : ["version": "latest", "helmRepositoryNamespace": "k8s"],
                 ])
                 k3d.configureComponentOperatorVersion("latest")
             }

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-ces-setup
-VERSION=1.0.1
+VERSION=2.0.0
 
 GOTAG?=1.22
 MAKEFILES_VERSION=9.0.5
@@ -158,10 +158,6 @@ k8s-clean: ## Cleans all resources deployed by the setup
 .PHONY: build-setup
 build-setup: ${SRC} compile ## Builds the setup Go binary.
 
-.PHONY: setup-etcd-port-forward
-setup-etcd-port-forward:
-	kubectl port-forward etcd-0 4001:2379 &
-
 .PHONY: run
 run: ## Run a setup from your host.
 	go run ./main.go

app/context/config.go

@@ -41,10 +41,6 @@ type Config struct {
 	ComponentOperatorChart string `json:"component_operator_chart" yaml:"component_operator_chart"`
 	// Components sets the List of Components that should be installed by the setup
 	Components map[string]ComponentAttributes `json:"components" yaml:"components"`
-	// EtcdServerResourceURL sets the K8s resource URL which controls the installation of the etcd server into the current cluster.
-	EtcdClientImageRepo string `json:"etcd_client_image_repo" yaml:"etcd_client_image_repo"`
-	// KeyProvider sets the key provider used to encrypt etcd values
-	KeyProvider string `json:"key_provider" yaml:"key_provider"`
 	// ResourcePatches contains json patches for kubernetes resources to be applied on certain phases of the setup process.
 	ResourcePatches []patch.ResourcePatch `json:"resource_patches" yaml:"resource_patches"`
 }

app/context/config_test.go

@@ -25,14 +25,11 @@ func TestReadConfig(t *testing.T) {
 		assert.Equal(t, "ecosystem", c.TargetNamespace)
 		assert.Equal(t, "k8s/k8s-component-operator-crd:0.0.2", c.ComponentOperatorCrdChart)
 		assert.Equal(t, "k8s/k8s-component-operator:0.0.2", c.ComponentOperatorChart)
-		assert.Len(t, c.Components, 3)
-		assert.Equal(t, "1.2.3", c.Components["k8s-etcd"].Version)
-		assert.Equal(t, "k8s", c.Components["k8s-etcd"].HelmRepositoryNamespace)
+		assert.Len(t, c.Components, 2)
 		assert.Equal(t, "0.0.1", c.Components["k8s-dogu-operator"].Version)
 		assert.Equal(t, "k8s", c.Components["k8s-dogu-operator"].HelmRepositoryNamespace)
 		assert.Equal(t, "latest", c.Components["k8s-service-discovery"].Version)
 		assert.Equal(t, "k8s", c.Components["k8s-service-discovery"].HelmRepositoryNamespace)
-		assert.Equal(t, "https://etcdc.yaml", c.EtcdClientImageRepo)
 		assert.Equal(t, logrus.DebugLevel, *c.LogLevel)
 	})
 

app/context/setupContext.go

@@ -101,11 +101,6 @@ func (scb *SetupContextBuilder) NewSetupContext(ctx context.Context, clientSet k
 
 	config.TargetNamespace = targetNamespace
 
-	keyProvider := config.KeyProvider
-	if keyProvider != "pkcs1v15" && config.KeyProvider != "oaesp" {
-		return nil, fmt.Errorf("invalid key provider: %s", keyProvider)
-	}
-
 	configureLogger(config)
 
 	return &SetupContext{

app/context/setupContext_test.go

@@ -81,8 +81,6 @@ func TestSetupContextBuilder_NewSetupContext(t *testing.T) {
 		assert.Equal(t, "1.2.3", actual.AppVersion)
 		assert.Equal(t, "myTestNamespace", actual.AppConfig.TargetNamespace)
 		assert.Equal(t, "k8s/k8s-component-operator:0.0.2", actual.AppConfig.ComponentOperatorChart)
-		assert.Equal(t, "https://etcdc.yaml", actual.AppConfig.EtcdClientImageRepo)
-		assert.Equal(t, "pkcs1v15", actual.AppConfig.KeyProvider)
 		assert.Equal(t, "user", actual.DoguRegistryConfiguration.Username)
 		assert.Equal(t, "pw", actual.DoguRegistryConfiguration.Password)
 		assert.Equal(t, "endpoint", actual.DoguRegistryConfiguration.Endpoint)

app/context/setupJson.go

@@ -136,7 +136,7 @@ type Dogus struct {
 }
 
 // CustomKeyValue is a map of string -> map pairs.
-type CustomKeyValue map[string]map[string]interface{}
+type CustomKeyValue map[string]map[string]any
 
 // SetupJsonConfiguration is the main struct for the configuration of the setup.
 type SetupJsonConfiguration struct {

app/context/testdata/testConfig.yaml

@@ -3,14 +3,9 @@ log_level: "DEBUG"
 component_operator_crd_chart: "k8s/k8s-component-operator-crd:0.0.2"
 component_operator_chart: "k8s/k8s-component-operator:0.0.2"
 components:
-  k8s-etcd:
-    version: "1.2.3"
-    helmRepositoryNamespace: k8s
   k8s-dogu-operator:
     version: "0.0.1"
     helmRepositoryNamespace: k8s
   k8s-service-discovery:
     version: "latest"
-    helmRepositoryNamespace: k8s
-etcd_client_image_repo: https://etcdc.yaml
-key_provider: pkcs1v15
+    helmRepositoryNamespace: k8s