Implemented controller for NATS CR #19

mfaizanse · 2023-03-30T11:20:58Z

Description

Changes proposed in this pull request:

Implemented controller for NATS CR

Related issue(s)

https://github.com/kyma-project/nats-manager/pull/18/files

mfaizanse · 2023-04-06T08:26:32Z

Makefile

@@ -65,7 +65,7 @@ vet: ## Run go vet against code.
 	go vet ./...

 .PHONY: test
-test: manifests go-gen generate fmt vet envtest lint-thoroughly ## Run tests.
+test: manifests generate fmt vet envtest lint-thoroughly ## Run tests.


go-gen is already called inside generate

marcobebway · 2023-04-06T14:34:51Z

Dockerfile

@@ -30,6 +30,8 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma
 FROM gcr.io/distroless/static:nonroot
 LABEL source = git@github.com:kyma-project/nats-manager.git

+ARG NATS_CHARTS_DIR="/resources/nats"


Where is this used?

marcobebway · 2023-04-06T14:56:59Z

api/v1alpha1/zz_generated.deepcopy.go

@@ -22,7 +22,7 @@ limitations under the License.
 package v1alpha1

 import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"


A bit strange code generation 😄

no idea, its gone now somehow.

marcobebway · 2023-04-06T14:58:52Z

config/manager/manager.yaml

@@ -69,6 +69,9 @@ spec:
        image: controller:latest
        imagePullPolicy: Always
        name: manager
+        env:
+        - name: NATS_CHARTS_DIR


NATS_CHARTS_DIR -> NATS_CHART_DIR

marcobebway · 2023-04-06T14:59:24Z

cmd/main.go

+		setupLog.Error(err, "unable to get configs from env")
+		os.Exit(1)
+	}
+
 	// @TODO: Re-check logger setup and init


Is this todo still relevant?

yes, I added a todo here #8

marcobebway · 2023-04-06T15:03:53Z

config/rbac/role.yaml

+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps/v1
+  resources:
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch


Too much power, do we really need them all?

It will be re-visited in this ticket: #21

marcobebway · 2023-04-06T15:41:08Z

internal/controller/nats/controller.go

+	// Check if istio is enabled in cluster
+	istioExists, err := r.kubeClient.DestinationRuleCRDExists(ctx)


As per the comment, this checks if istio is enabled in the cluster or not. I'm not sure if that's the right way to do it. I think we need to check if istio as a Kyma module is ready or not, by checking istio CR status.state. What do you think?

Well, the only thing we care about is the DestinationRule exists or not, so we can create CR for it. Checking the kyma module will make it more coupled to Istio module. Also, what if user has it own deployment of istio resources.

marcobebway · 2023-04-06T15:43:45Z

internal/controller/nats/controller.go

+
+	// @TODO: Provide the overrides in component.Configuration
+	instance.Configuration = map[string]interface{}{
+		"istio.enabled":       istioExists,


What will this do in case of true/false?

If true, then it will create DestinationRule CR.

marcobebway · 2023-04-06T15:52:12Z

internal/controller/nats/controller.go

+	// @TODO: Provide the overrides in component.Configuration
+	instance.Configuration = map[string]interface{}{
+		"istio.enabled":       istioExists,
+		"auth.rotatePassword": accountSecret == nil, // do not recreate secret if it exists


Are we sure this will create a secret that matches the accountSecretName and nats.Namespace?

The name format is the same in NATS helm chart. If someone changes the name format in helm, the pre-main tests should fail.

marcobebway · 2023-04-06T15:56:02Z

internal/controller/nats/controller.go

+func (r *Reconciler) loggerWithNATS(nats *natsv1alpha1.NATS) *zap.SugaredLogger {
+	return r.logger.With(
+		"kind", nats.GetObjectKind().GroupVersionKind().Kind,
+		"version", nats.GetGeneration(),


"version" -> "generation"

mfaizanse · 2023-04-13T07:45:16Z

/cla-recheck

added controller

096a7c9

kyma-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 30, 2023

mfaizanse linked an issue Mar 30, 2023 that may be closed by this pull request

Handle external charts provided by nats_io #11

Closed

4 tasks

mfaizanse added 9 commits March 30, 2023 14:54

added tests

07a6b74

added tests

8ff7d0c

added tests

199548f

added tests

7c56b53

added tests

d3469a8

added env config

f01c683

revert makefile

5020b86

added rbacs

b797e9b

updated rbacs

d4f8066

This was referenced Mar 31, 2023

Nats-manager applies charts to cluster - provisioning #15

Closed

Handle external charts provided by nats_io #11

Closed

resolved merge conflicts

ae40a40

mfaizanse marked this pull request as ready for review April 6, 2023 08:13

mfaizanse requested a review from a team as a code owner April 6, 2023 08:13

kyma-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 6, 2023

cleanup

3fb65a7

mfaizanse commented Apr 6, 2023

View reviewed changes

mfaizanse assigned mfaizanse and marcobebway Apr 6, 2023

marcobebway reviewed Apr 6, 2023

View reviewed changes

mfaizanse added 2 commits April 11, 2023 13:02

addressed review comments part 1

7541057

resolved merge conflicts

ffea8f3

marcobebway approved these changes Apr 13, 2023

View reviewed changes

kyma-bot added the lgtm Looks good to me! label Apr 13, 2023

mfaizanse merged commit 7e080fb into kyma-project:main Apr 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implemented controller for NATS CR #19

Implemented controller for NATS CR #19

mfaizanse commented Mar 30, 2023

mfaizanse Apr 6, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023 •

edited

Loading

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023 •

edited

Loading

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

marcobebway Apr 6, 2023

mfaizanse Apr 11, 2023

mfaizanse commented Apr 13, 2023

		// Check if istio is enabled in cluster
		istioExists, err := r.kubeClient.DestinationRuleCRDExists(ctx)

Implemented controller for NATS CR #19

Implemented controller for NATS CR #19

Conversation

mfaizanse commented Mar 30, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcobebway Apr 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcobebway Apr 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mfaizanse commented Apr 13, 2023

marcobebway Apr 6, 2023 •

edited

Loading

marcobebway Apr 6, 2023 •

edited

Loading