Merge pull request #176 from juergen-kaiser/bugfixing

Bugfixing etc.

Author: ib-steffen

src/services/gardener/pkg/stub/handler.go

@@ -113,13 +113,13 @@ func (h *Handler) sync(shootCluster *v1alpha1.ShootCluster, log *logrus.Entry) e
 
 	if shootCluster.Status.Status != oldStatus || shootCluster.Status.Message != oldMsg {
 		if err := action.Update(shootCluster); err != nil {
-			log.Error("failed to update cr. err: ", err)
+			log.Error("failed to update cr after sync. err: ", err)
 			return err
 		}
 	}
 
 	if shootCluster.Status.Status == v1alpha1.ShootClusterStateShootReady {
-		if err := h.injectCollectorsAndUpdateState(shootCluster, log); err != nil {
+		if err := h.injectCollectorsAndUpdateState(shootCluster, log); err != nil && !errors.IsResourceExpired(err) {
 			return err
 		}
 	}
@@ -197,7 +197,9 @@ func (h *Handler) injectCollectorsAndUpdateState(shootCluster *v1alpha1.ShootClu
 
 	shootCluster.Status.Status = v1alpha1.ShootClusterStateReady
 	if err := action.Update(shootCluster); err != nil {
-		log.Error("failed to update cr. err: ", err)
+		if !errors.IsResourceExpired(err) { // deletion might be triggered
+			log.Error("failed to update cr during collector injection. err: ", err)
+		}
 		return err
 	}
 
@@ -261,6 +263,11 @@ func (h *Handler) getRemoteClusterFromSecret(ns *v1alpha1.ShootCluster, log *log
 }
 
 func (h *Handler) delete(sc *v1alpha1.ShootCluster, log *logrus.Entry) error {
+	if len(sc.GetFinalizers()) == 0 { // work was finished in a previous run. We just got this cr again before it was deleted
+		log.Debug("got a to-delete cr, but work was already done -> ignore")
+		return nil
+	}
+
 	if sc.Status.Status == v1alpha1.ShootClusterStateShootReady {
 		cluster, err := h.getRemoteClusterFromSecret(sc, log)
 		if err != nil && !errors.IsNotFound(err) {
@@ -273,6 +280,7 @@ func (h *Handler) delete(sc *v1alpha1.ShootCluster, log *logrus.Entry) error {
 
 	sc.Status.Status = v1alpha1.ShootClusterStateDeleting
 	if err := action.Update(sc); err != nil {
+		log.Errorf("couldn't update cluster state to %s. err: %s", sc.Status.Status, err)
 		return err
 	}
 

src/services/gardener/pkg/stub/shootOperations/common/constants.go

@@ -1,17 +1,17 @@
 package common
 
 const (
-	EnvCredentialSecretName  = "CRENDENTIALS_SECRET" // env variable for name of input secret
+	EnvCredentialSecretName  = "CREDENTIALS_SECRET" // env variable for name of input secret
 	KeyGardenKubectlInSecret = "garden_kubecfg"
 
 	// output secret
 	LabelForTargetSecret = "service.infrabox.net/secret-name"
 
 	// keys of "output" entries
 	KeyNameOfShootKubecfgInSecret    = "config"
-	KeyNameOfShootKubecfgKeyInSecret = "kubecfg.key"
 	KeyNameOfShootCaCrtInSecret      = "ca.crt"
-	KeyNameOfShootKubecfgCrtInSecret = "kubecfg.crt"
+	KeyNameOfShootKubecfgKeyInSecret = "client.key"
+	KeyNameOfShootKubecfgCrtInSecret = "client.crt"
 	KeyNameOfShootUserInSecret       = "username"
 	KeyNameOfShootPasswordInSecret   = "password"
 	KeyNameOfShootEndpointInSecret   = "endpoint"

src/services/gardener/pkg/stub/shootOperations/delete.go

@@ -18,9 +18,9 @@ import (
 )
 
 func deleteShootCluster(shoots gardenV1beta1.ShootInterface, shootCluster *v1alpha1.ShootCluster, log *logrus.Entry) {
-	logSuccess := func() { log.Infof("successfully triggered deletion of shoot %s", shootCluster.Status.ClusterName) }
+	logSuccess := func() { log.Debugf("successfully triggered deletion of shoot %s", shootCluster.Status.ClusterName) }
 
-	log.Infof("Try to delete shoot %s in the namespace %s", shootCluster.Status.ClusterName, shootCluster.Status.GardenerNamespace)
+	log.Debugf("Try to delete shoot %s in the namespace %s", shootCluster.Status.ClusterName, shootCluster.Status.GardenerNamespace)
 	err := setDeletionConfirmation(shoots, shootCluster.Status.ClusterName, log)
 	if err != nil {
 		if apiErrors.IsNotFound(err) {
@@ -86,9 +86,9 @@ func createDeletionConfirmationJPatch(shoot *v1beta1.Shoot) ([]byte, error) {
 		return nil, errors.New("Couldn't marshal old shoot: " + err.Error())
 	}
 	if shoot.GetAnnotations() == nil {
-		shoot.Annotations = map[string]string{"confirmation.gardener.sapcloud.io/deletion": "true"}
+		shoot.Annotations = map[string]string{"confirmation.garden.sapcloud.io/deletion": "true"}
 	} else {
-		shoot.GetAnnotations()["confirmation.gardener.sapcloud.io/deletion"] = "true"
+		shoot.GetAnnotations()["confirmation.garden.sapcloud.io/deletion"] = "true"
 	}
 	tjson, err := json.Marshal(shoot)
 	if err != nil {

src/services/gardener/pkg/stub/shootOperations/shoot_operator.go

@@ -13,6 +13,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/sap/infrabox/src/services/gardener/pkg/apis/gardener/v1alpha1"
 	"github.com/sap/infrabox/src/services/gardener/pkg/stub/shootOperations/common"
@@ -58,11 +59,6 @@ func (so *ShootOperator) Sync(shootCluster *v1alpha1.ShootCluster) error {
 		return err
 	}
 
-	// shoot creation was triggered or is completed
-	if err := so.setFinalizerIfNotPresent(shootCluster); err != nil {
-		return err
-	}
-
 	if len(shootCluster.Status.Status) == 0 {
 		shootCluster.Status.Status = v1alpha1.ShootClusterStateCreating
 		shootCluster.Status.Message = ""
@@ -88,17 +84,6 @@ func (so *ShootOperator) Sync(shootCluster *v1alpha1.ShootCluster) error {
 	return err
 }
 
-func (so *ShootOperator) setFinalizerIfNotPresent(shootCluster *v1alpha1.ShootCluster) error {
-	if len(shootCluster.GetFinalizers()) == 0 {
-		shootCluster.SetFinalizers([]string{"datahub.sap.com"})
-		if err := so.operatorSdk.Update(shootCluster); err != nil {
-			so.log.Error("Failed to set finalizers")
-			return err
-		}
-	}
-	return nil
-}
-
 func (so *ShootOperator) syncSecret(shootCluster *v1alpha1.ShootCluster, shootCredsSecret *corev1.Secret, clientGetter k8sClientCache.ClientGetter) {
 	secretWeWant := newSecretFromShootCredSecr(shootCluster, shootCredsSecret)
 
@@ -213,14 +198,12 @@ func extractEndpoint(s *corev1.Secret) []byte {
 }
 
 func setShootClusterCrAsOwner(shootCluster *v1alpha1.ShootCluster, secret *corev1.Secret) {
-	gvk := shootCluster.GetObjectKind().GroupVersionKind()
 	secret.OwnerReferences = []v1.OwnerReference{
-		{
-			APIVersion: gvk.Version,
-			Name:       shootCluster.GetName(),
-			Kind:       gvk.Kind,
-			UID:        shootCluster.GetUID(),
-		},
+		*v1.NewControllerRef(shootCluster, schema.GroupVersionKind{
+			Group:   v1alpha1.SchemeGroupVersion.Group,
+			Version: v1alpha1.SchemeGroupVersion.Version,
+			Kind:    shootCluster.Kind,
+		}),
 	}
 }
 
@@ -298,10 +281,10 @@ func (so *ShootOperator) Delete(shootCluster *v1alpha1.ShootCluster) error {
 
 	shootCluster.SetFinalizers([]string{})
 	if err := so.operatorSdk.Update(shootCluster); err != nil {
-		so.log.Errorf("Could not update shootClusterstructure object (removing finalizers). err: %s", err)
+		so.log.Errorf("Could not update shootCluster object (removing finalizers). err: %s", err)
 		return err
 	} else {
-		so.log.Infof("successfully deleted shootClusterstructure %s", shootCluster.GetName())
+		so.log.Debugf("successfully deleted shootCluster %s", shootCluster.GetName())
 	}
 
 	return nil

src/services/gardener/pkg/stub/shootOperations/shoot_operator_test.go

@@ -225,15 +225,9 @@ func TestShootOperator_SimpleSyncForEmptyCluster(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	storedCluster := &v1alpha1.ShootCluster{}
-	ShootCluster.DeepCopyInto(storedCluster)
-	if err := mock.Get(storedCluster); err != nil {
-		t.Fatal(err)
-	}
-
 	// shoot cluster isn't ready (we didn't set its state accordingly) => state also musn't be ready
-	if storedCluster.Status.Status == v1alpha1.ShootClusterStateShootReady {
-		t.Fatalf("wrong state. cluster shouldn't be ready, but got: %s", storedCluster.Status.Status)
+	if ShootCluster.Status.Status == v1alpha1.ShootClusterStateShootReady {
+		t.Fatalf("wrong state. cluster shouldn't be ready, but got: %s", ShootCluster.Status.Status)
 	}
 }