Merge pull request #74 from microsoft/eedorenko/add-parameters

Add workspace and application config values

Author: eedorenko

config/manager/manager.yaml

@@ -78,6 +78,18 @@ spec:
             configMapKeyRef:
               key: STORAGE_SERVICE_ADDRESS
               name: controller-manager-config
+        - name: WORKSPACE
+          valueFrom:
+            configMapKeyRef:
+              key: WORKSPACE
+              name: controller-manager-config
+              optional: true              
+        - name: APPLICATION
+          valueFrom:
+            configMapKeyRef:
+              key: APPLICATION
+              name: controller-manager-config
+              optional: true                   
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -122,4 +134,7 @@ metadata:
     app.kubernetes.io/part-of: kalypso-observability-hub
     app.kubernetes.io/managed-by: kustomize
 data:
-  STORAGE_SERVICE_ADDRESS: "kalypso-observability-hub-api-server:50051"
+  STORAGE_SERVICE_ADDRESS: "kalypso-observability-hub-api-server:50051"
+  WORKSPACE: "workspace"
+  APPLICATION: "application"
+  

config/rbac/kustomization.yaml

@@ -9,6 +9,8 @@ resources:
 - role_binding.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
+- secret_viewer_role.yaml
+- secret_viewer_role_binding.yaml
 # Comment the following 4 lines if you want to disable
 # the auth proxy (https://github.com/brancz/kube-rbac-proxy)
 # which protects your /metrics endpoint.

config/rbac/secret_viewer_role.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: secret-viewer-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - secrets
+  verbs:
+  - get
+  - watch
+  - list
+

config/rbac/secret_viewer_role_binding.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: secret-viewer-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: secret-viewer-role
+subjects:
+- kind: ServiceAccount
+  name: controller-manager
+  namespace: system

controllers/azureresourcegraph_controller.go

@@ -339,6 +339,14 @@ func (r *AzureResourceGraphReconciler) getReconcilersDataFromChildKalypsoObjects
 			return nil, err
 		}
 	}
+	var environmentName string
+	var workspace string
+	var application string
+	var workloadName string
+	var deploymentTargetName string
+
+	workspace = os.Getenv("WORKSPACE")
+	application = os.Getenv("APPLICATION")
 
 	fluxConfigurationDetal := res.FluxConfiguration
 	// iteretae over the statuses and log them
@@ -347,17 +355,20 @@ func (r *AzureResourceGraphReconciler) getReconcilersDataFromChildKalypsoObjects
 			continue
 		}
 
-		//TODO Update Kalypso: name deployment target as workload.deploymentTarget or without workload at all
 		// expected flux resource name format: env.workspace.application.workload.deploymentTarget[.clusterType]
 		nameParts := strings.Split(*status.Name, ".")
-		if len(nameParts) < 5 {
-			continue
+
+		if len(nameParts) >= 5 {
+			environmentName = nameParts[0]
+			workspace = nameParts[1]
+			application = nameParts[2]
+			workloadName = nameParts[3]
+			deploymentTargetName = nameParts[4]
+		} else if len(nameParts) >= 3 {
+			environmentName = nameParts[0]
+			workloadName = nameParts[1]
+			deploymentTargetName = nameParts[2]
 		}
-		environmentName := nameParts[0]
-		workspace := nameParts[1]
-		application := nameParts[2]
-		workloadName := nameParts[3]
-		deploymentTargetName := nameParts[4]
 
 		dt, err := storageClient.GetDeploymentTarget(ctx, &pb.DeploymentTargetSearch{
 			WorkloadName:         workloadName,

helm/kalypso-observability-hub/Chart.yaml

@@ -22,7 +22,7 @@ appVersion: "1.1.2"
 
 dependencies: 
   - name: api-server
-    version: 1.1.1  
+    version: 1.1.2
 
   - name: postgres
     version: 0.1.0  

helm/kalypso-observability-hub/charts/api-server/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.1.1"
+version: "1.1.2"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.1.1"
+appVersion: "1.1.2"

helm/kalypso-observability-hub/crds/deploymentdescriptor-crd.yaml

@@ -193,6 +193,8 @@ spec:
                   - type
                   type: object
                 type: array
+              gitOpsCommitId:
+                type: string
             type: object
         type: object
     served: true

helm/kalypso-observability-hub/templates/controller-manager-config.yaml

@@ -9,5 +9,7 @@ metadata:
     control-plane: controller-manager
   {{- include "tmp.labels" . | nindent 4 }}
 data:
+  APPLICATION: {{ .Values.controllerManagerConfig.application | quote }}
   STORAGE_SERVICE_ADDRESS: {{ .Values.controllerManagerConfig.storageServiceAddress
-    | quote }}
+    | quote }}
+  WORKSPACE: {{ .Values.controllerManagerConfig.workspace | quote }}

helm/kalypso-observability-hub/templates/deployment.yaml

@@ -83,6 +83,18 @@ spec:
             configMapKeyRef:
               key: STORAGE_SERVICE_ADDRESS
               name: {{ include "tmp.fullname" . }}-controller-manager-config
+        - name: WORKSPACE
+          valueFrom:
+            configMapKeyRef:
+              key: WORKSPACE
+              name: {{ include "tmp.fullname" . }}-controller-manager-config
+              optional: true
+        - name: APPLICATION
+          valueFrom:
+            configMapKeyRef:
+              key: APPLICATION
+              name: {{ include "tmp.fullname" . }}-controller-manager-config
+              optional: true
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
         image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag