wip

Makefile

@@ -17,7 +17,7 @@ MANIFEST_FILE=btp-manager.yaml
 # Image URL to use all building/pushing image targets
 IMG_REGISTRY_PORT ?= 5001
 IMG_REGISTRY ?= k3d-kyma-registry:$(IMG_REGISTRY_PORT)
-IMG ?= $(IMG_REGISTRY)/btp-manager:$(MODULE_VERSION)
+IMG ?= europe-docker.pkg.dev/kyma-project/dev/btp-manager:PR-953
 
 COMPONENT_CLI_VERSION ?= latest
 

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: europe-docker.pkg.dev/kyma-project/prod/btp-manager
-  newTag: 0.0.23-test
+  newName: europe-docker.pkg.dev/kyma-project/dev/btp-manager
+  newTag: PR-953

controllers/btpoperator_controller.go

@@ -522,27 +522,27 @@ func (r *BtpOperatorReconciler) reconcileResources(ctx context.Context, managerS
 	operatorSecret := resourcesToApply[secretIndex]
 	operatorConfigMap := resourcesToApply[configMapIndex]
 
-	managementNamespace, err := r.resolveManagementNamespace(ctx, managerSecret, &logger)
+	namespace, err := r.resolveNamesapce(ctx, managerSecret, &logger)
 	if err != nil {
-		return fmt.Errorf("failed to resolve namespace %s : %w", managementNamespace, err)
+		return fmt.Errorf("failed to resolve namespace %s : %w", namespace, err)
 	}
 
 	if err := r.reconcileSecrets(managerSecret, operatorSecret); err != nil {
 		logger.Error(err, fmt.Sprintf("while setting Secret %s values", btpServiceOperatorSecret))
 		return fmt.Errorf("failed to set Secret %s values: %w", btpServiceOperatorSecret, err)
 	}
 
-	logger.Info(fmt.Sprintf("propagating %s changes to secret: %s and config map : %s", SecretName, btpServiceOperatorSecret, btpServiceOperatorConfigMap))
-	configMapChanged, clusterIdChanged, err := r.propagateManagerSecretChanges(ctx, managementNamespace, managerSecret, operatorConfigMap, &logger)
+	logger.Info(fmt.Sprintf("propagating %s changes to config map : %s", SecretName, btpServiceOperatorConfigMap))
+	configMapChanged, clusterIdChanged, err := r.propagateManagerSecretChanges(ctx, namespace, managerSecret, operatorConfigMap, &logger)
 	logger.Info(fmt.Sprintf("configMapChanged %t", configMapChanged))
 	if err != nil {
 		logger.Error(err, fmt.Sprintf("propagating %s changes to secret: %s and config map : %s : %s", SecretName, btpServiceOperatorSecret, btpServiceOperatorConfigMap, err.Error()))
 		return fmt.Errorf(fmt.Sprintf("propagating %s changes to secret: %s and config map : %s: %s", SecretName, btpServiceOperatorSecret, btpServiceOperatorConfigMap, err.Error()))
 	}
 
 	if configMapChanged {
-		logger.Info(fmt.Sprintf("setting %s secret namespace to %s", btpServiceOperatorSecret, managementNamespace))
-		operatorSecret.SetNamespace(managementNamespace)
+		logger.Info(fmt.Sprintf("setting %s secret namespace to %s", btpServiceOperatorSecret, namespace))
+		operatorSecret.SetNamespace(namespace)
 	}
 
 	logger.Info(fmt.Sprintf("applying module resources for %d resources", len(resourcesToApply)))
@@ -621,7 +621,7 @@ func (r *BtpOperatorReconciler) propagateManagerSecretChanges(ctx context.Contex
 	return namespaceChanged, clusterIdChanged, nil
 }
 
-func (r *BtpOperatorReconciler) resolveManagementNamespace(ctx context.Context, managerSecret *corev1.Secret, logger *logr.Logger) (string, error) {
+func (r *BtpOperatorReconciler) resolveNamesapce(ctx context.Context, managerSecret *corev1.Secret, logger *logr.Logger) (string, error) {
 	managementNamespace := string(managerSecret.Data[managementNamespaceKey])
 	if managementNamespace == "" || managementNamespace == ChartNamespace {
 		logger.Info(fmt.Sprintf("management namespace not set. using %s", ChartNamespace))
@@ -699,7 +699,7 @@ func (r *BtpOperatorReconciler) restartOperatorDeployment(ctx context.Context, l
 	}
 
 	labelSelector := metav1.FormatLabelSelector(deployment.Spec.Selector)
-	pods, err := podClient.List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector})
+	pods, err := podClient.List(ctx, metav1.ListOptions{LabelSelector: labelSelector})
 	if err != nil {
 		return fmt.Errorf("error listing pods: %v", err)
 	}

controllers/btpoperator_controller_secret_customization_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/kyma-project/btp-manager/api/v1alpha1"
 	"github.com/kyma-project/btp-manager/internal/conditions"

k3.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkakNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTXpZek5USXlPRGN3SGhjTk1qVXdNVEE0TVRZd05EUTNXaGNOTXpVd01UQTJNVFl3TkRRMwpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTXpZek5USXlPRGN3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSSUxxa1VRM3pTSlBlS2duSWZBeW9BTS9qdktEMHdGS051VStBS0wwck4KUTV5UjZaVmlZNWZHbEl5Y00wRVdSemlWS2kwM1lQS0R0dEtubHVKdHdaYVlvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTVVWEJyNjAvTEtGWVptN0QwWTl0CjM0YmpGUGt3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnR0hIMUNVWEUxUTJQakM1cG5XU2pvamRYOHB6MldOVmIKWndZam9oZ1M0ZllDSUZWOW5uNk1yOUpuaFJyMW1jb3YyY0w4bEZZbXdYTlcrbkM2aHFLYkNKWXAKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://0.0.0.0:50324
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTXpZME1EQTRNVGt3SGhjTk1qVXdNVEE1TURVek16TTVXaGNOTXpVd01UQTNNRFV6TXpNNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTXpZME1EQTRNVGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRVlVPMlBsYmoxQ3F5TnlxaWJEZzRQWXAyaXR2ejNYK2Q2WHZ6eDg2cEoKTjAwUWViYnhmOHBuK1dsakptbjdkSEpSWm1XempFSEJhVDI4WE51SHovSHlvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVU5kempIWm1Fb29HSnM1YTFDUEhHCm95eDVoMFV3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnTUw0MHR1WlVSMCs2anBWKytZUjl4TW1BQTNVRjVlejYKYWJOb2tQRkE5eklDSVFEVjYvUXVjdWVrRmxsQkJQYnc1QTlMdGFVTk1jalNFSHZra2dMeUlweFFqUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    server: https://0.0.0.0:59890
   name: k3d-test
 contexts:
 - context:
@@ -16,5 +16,5 @@ preferences: {}
 users:
 - name: admin@k3d-test
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrRENDQVRlZ0F3SUJBZ0lJRStuK2pVNlRoME13Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOek0yTXpVeU1qZzNNQjRYRFRJMU1ERXdPREUyTURRME4xb1hEVEkyTURFdwpPREUyTURRME4xb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJNZEZUbTRKamlLRmtnaU8KcEdPOEJQZXorZVBSK2F1UHFWWVYrdlNiUGp3bTA0TUFwMlF2aGdxQkFwUFlJZ0I0cEdLQkc0WE9IRVNUc3FrZQo5SVBRdXJTalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCU2JnaXF1ejg4VUFPT3J2ZWlKdXZSMlJrV093VEFLQmdncWhrak9QUVFEQWdOSEFEQkUKQWlCbUt6QWlVaFA0SEZkdDZBaWxiM2Z5K2M1K1h0OU54ZVhpUEJFK2ZIeWFXUUlnREpRM1VCelhsNmMwck9lUQpjRU1HdnVVK2xFUDd5b2l2TGtUWk42KzdZM0k9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTXpZek5USXlPRGN3SGhjTk1qVXdNVEE0TVRZd05EUTNXaGNOTXpVd01UQTJNVFl3TkRRMwpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTXpZek5USXlPRGN3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUSkI4YlZySEVxRFJaTW1vRExqbzhvR0xIZ2tzdWFsdWVOWjhseWlZelAKZGhjM1NRdEk5OFNUNitkZFlGYzc2b3ZTL0JmUnBNUTRCcElCU09idzZDb1NvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVW00SXFycy9QRkFEanE3M29pYnIwCmRrWkZqc0V3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxUejMybzZCcW9ybVZRSENkQUl1My9zaCt2WTByVFMKb0o4RTR6U2RnbFJaQWlFQTZWb3pPa1EvRG83NGRxdFFVUGE1NkpnNUtCZGhmNGNsQlhOMER5MkgzbUE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-    client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUp4SnJtdEdwUDNQeU4zUHFhR204eUx6V3RoNUVDZ1gvRGpFYnNlVzNiU05vQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFeDBWT2JnbU9Jb1dTQ0k2a1k3d0U5N1A1NDlINXE0K3BWaFg2OUpzK1BDYlRnd0NuWkMrRwpDb0VDazlnaUFIaWtZb0ViaGM0Y1JKT3lxUjcwZzlDNnRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJYmt6RytMRWRwM2d3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOek0yTkRBd09ERTVNQjRYRFRJMU1ERXdPVEExTXpNek9Wb1hEVEkyTURFdwpPVEExTXpNek9Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJLMWRLd3dsVVFRc1FuWG8KdkhQV09NZnJxY0JWK0NGNm56ZHJ5N29pcDIzMHlnU1ZiRm4zRXpVWTVuVnlDSU1IZ094UEs5TEJ1RWtFZ3E2TwpRMnRzQlVPalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUm9oY0E5aFg0UktuMzZWdE1GbHpaTHh4Vmp2ekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlCc0wyaHZxaVhyd3FWN05XTXNJMVY2Q1RMcnZvN3djbzFabm1BUXZQVnRLZ0loQU1DTVBJRldrazN4alJPTQo1RWZvQnBKSnVVVEZYdnJwSEQ5OVRiODlOR3NYCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTXpZME1EQTRNVGt3SGhjTk1qVXdNVEE1TURVek16TTVXaGNOTXpVd01UQTNNRFV6TXpNNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTXpZME1EQTRNVGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUS21obERtcjUwZkZuWDR2WnhpbWw0Uy9tRU0rOEVJdnprTk8xMVlrd3QKN285TVhnUEpldUo3OGhyTTRuWXovRzBqS3g0RTZjTTZ3blB4ZWlCSGtmOEJvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWFJWEFQWVYrRVNwOStsYlRCWmMyClM4Y1ZZNzh3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQU1CQlphWjRPVHZoK2JGQzVoYnhNdHhJMWdIOFVNQ0kKRmtBQkRtS2t2WnY3QWlBcFEraTQvWVAyTnZCeGpnbVdkd3BCQm95eUFjTWtTaXlmcm1NK3BvOW9rQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU9VejJqdStDU0VyWFFwemlGTDU4MDNTNHg5cUpUUUpDMVZvdkM1MlJDbWpvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFclYwckRDVlJCQ3hDZGVpOGM5WTR4K3Vwd0ZYNElYcWZOMnZMdWlLbmJmVEtCSlZzV2ZjVApOUmptZFhJSWd3ZUE3RThyMHNHNFNRU0NybzVEYTJ3RlF3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=

scripts/testing/install_module.sh

@@ -52,6 +52,11 @@ kubectl apply -f ${YAML_DIR}/e2e-test-btpoperator.yaml
 while [[ $(kubectl get btpoperators/e2e-test-btpoperator -ojson| jq '.status.conditions[] | select(.type=="Ready") |.status+.reason'|xargs)  != "TrueReconcileSucceeded" ]];
 do echo -e "\n---Waiting for BTP Operator to be ready and reconciled"; sleep 5; done
 
+while [[ $(kubectl get deployment/sap-btp-operator-controller-manager -n kyma-system -o 'jsonpath={..status.conditions[?(@.type=="Available")].status}') != "True" ]];
+do echo -e "\n---Waiting for deployment to be available"; sleep 5; done
+
+echo -e "\n---Deployment available"
+
 # verifying whether service instance and service binding custom resources were created
 echo -e "\n---Checking if serviceinstances and servicebindings CRDs are created"
 
@@ -62,4 +67,4 @@ then
   exit 1
 fi
 
-echo "\n---Module installed successfully"
+echo -e "\n---Module installed successfully"