Join helm charts (#17)

* Join helm charts

* use dockerregistry name

* rename secret

* remove dependency

* remove globals from values.yaml

* adjust flags

* fix tests

* FIX TEST

components/operator/controllers/controller_test.go

@@ -2,9 +2,10 @@ package controllers
 
 import (
 	"context"
-	"github.com/kyma-project/docker-registry/components/operator/internal/registry"
 	"time"
 
+	"github.com/kyma-project/docker-registry/components/operator/internal/registry"
+
 	"github.com/kyma-project/docker-registry/components/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -17,7 +18,7 @@ var _ = Describe("DockerRegistry controller", func() {
 		const (
 			namespaceName  = "kyma-system"
 			crName         = "cr-test"
-			deploymentName = "internal-docker-registry"
+			deploymentName = "dockerregistry"
 			registrySecret = registry.SecretName
 		)
 

components/operator/internal/chart/flags.go

@@ -83,12 +83,12 @@ func (fb *flagsBuilder) WithRegistryCredentials(username, password string) *flag
 }
 
 func (fb *flagsBuilder) WithRegistryHttpSecret(httpSecret string) *flagsBuilder {
-	fb.flags["docker-registry.rollme"] = "dontrollplease"
-	fb.flags["docker-registry.registryHTTPSecret"] = httpSecret
+	fb.flags["rollme"] = "dontrollplease"
+	fb.flags["registryHTTPSecret"] = httpSecret
 	return fb
 }
 
 func (fb *flagsBuilder) WithNodePort(nodePort int64) *flagsBuilder {
-	fb.flags["global.registryNodePort"] = nodePort
+	fb.flags["registryNodePort"] = nodePort
 	return fb
 }

components/operator/internal/chart/flags_test.go

@@ -23,17 +23,13 @@ func Test_flagsBuilder_Build(t *testing.T) {
 					},
 				},
 			},
-			"docker-registry": map[string]interface{}{
-				"registryHTTPSecret": "testHttpSecret",
-				"rollme":             "dontrollplease",
-			},
+			"registryHTTPSecret": "testHttpSecret",
+			"rollme":             "dontrollplease",
 			"dockerRegistry": map[string]interface{}{
 				"password": "testPassword",
 				"username": "testUsername",
 			},
-			"global": map[string]interface{}{
-				"registryNodePort": int64(1234),
-			},
+			"registryNodePort": int64(1234),
 		}
 
 		flags := NewFlagsBuilder().

components/operator/internal/chart/pvc.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	dockerRegistryPVCName = "internal-docker-registry"
+	dockerRegistryPVCName = "dockerregistry"
 	pvcKind               = "PersistentVolumeClaim"
 	pvcVersion            = "v1"
 	pvcGroup              = ""

components/operator/internal/controllers/kubernetes/shared.go

@@ -17,7 +17,7 @@ const (
 
 type Config struct {
 	BaseNamespace                 string        `envconfig:"default=kyma-system"`
-	BaseDefaultSecretName         string        `envconfig:"default=internal-dockerregistry-config"`
+	BaseDefaultSecretName         string        `envconfig:"default=dockerregistry-config"`
 	ExcludedNamespaces            []string      `envconfig:"default=kyma-system"`
 	ConfigMapRequeueDuration      time.Duration `envconfig:"default=1m"`
 	SecretRequeueDuration         time.Duration `envconfig:"default=1m"`

components/operator/internal/registry/node_port.go

@@ -19,7 +19,7 @@ const (
 )
 
 const (
-	dockerRegistryService  = "internal-docker-registry"
+	dockerRegistryService  = "dockerregistry"
 	dockerRegistryPortName = "http-registry"
 
 	allNamespaces = ""

components/operator/internal/registry/secret.go

@@ -9,11 +9,11 @@ import (
 )
 
 const (
-	SecretName     = "internal-dockerregistry-config"
+	SecretName     = "dockerregistry-config"
 	LabelConfigKey = "dockerregistry.kyma-project.io/config"
 	LabelConfigVal = "credentials"
 	IsInternalKey  = "isInternal"
-	DeploymentName = "internal-docker-registry"
+	DeploymentName = "dockerregistry"
 	HttpEnvKey     = "REGISTRY_HTTP_SECRET"
 )
 

components/operator/internal/state/registry_test.go

@@ -23,9 +23,7 @@ func Test_sFnRegistryConfiguration(t *testing.T) {
 			log: zap.NewNop().Sugar(),
 		}
 		expectedFlags := map[string]interface{}{
-			"global": map[string]interface{}{
-				"registryNodePort": int64(32_137),
-			},
+			"registryNodePort": int64(32_137),
 		}
 
 		next, result, err := sFnRegistryConfiguration(context.Background(), r, s)

config/docker-registry/Chart.yaml

@@ -1,8 +1,7 @@
 apiVersion: v1
 description: Kyma component 'docker registry'
 name: docker-registry
-version: 1.0.0
+version: 1.9.1
+appVersion: 2.7.1
 home: https://kyma-project.io
 icon: https://github.com/kyma-project/kyma/blob/main/logo.png?raw=true
-dependencies:
-  - name: docker-registry

config/docker-registry/templates/_helpers.tpl

@@ -1,3 +1,28 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "docker-registry.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "docker-registry.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -34,7 +59,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "registry-fullname" -}}
-{{- "internal-docker-registry" -}}
+{{- "dockerregistry" -}}
 {{- end -}}