Merge pull request #571 from deckhouse/nm-fix-bashible-apiserver-cont…

…ext-for-static

[node-manager][bashible-apiserver] Fix: no context for node groups in static cluster

dhctl/pkg/kubernetes/actions/deckhouse/log.go

@@ -270,6 +270,14 @@ func (d *LogPrinter) Print(ctx context.Context) (bool, error) {
 		case <-ctx.Done():
 			return false, ErrTimedOut
 		default:
+			ready, err := d.checkDeckhousePodReady()
+			if err != nil {
+				return false, err
+			}
+			if ready {
+				return true, nil
+			}
+
 			request := d.kubeCl.CoreV1().Pods("d8-system").GetLogs(d.deckhousePod.Name, &logOptions)
 			result, err := request.DoRaw(context.TODO())
 			if err != nil {
@@ -278,13 +286,6 @@ func (d *LogPrinter) Print(ctx context.Context) (bool, error) {
 			}
 
 			d.printLogsByLine(result)
-			ready, err := d.checkDeckhousePodReady()
-			if err != nil {
-				return false, err
-			}
-			if ready {
-				return true, nil
-			}
 
 			time.Sleep(time.Second)
 			currentTime := metav1.NewTime(time.Now())

modules/040-node-manager/images/bashible-apiserver/pkg/template/context.go

@@ -355,7 +355,12 @@ func (c *BashibleContext) Get(contextKey string) (map[string]interface{}, error)
 
 	raw, ok := c.data[contextKey]
 	if !ok {
-		return nil, fmt.Errorf("context not found for secretKey \"%s\"", contextKey)
+		// log exists keys for debug purposes
+		keys := make([]string, 0, len(c.data))
+		for k := range c.data {
+			keys = append(keys, k)
+		}
+		return nil, fmt.Errorf("context not found for secretKey \"%s\". Have keys: %v", contextKey, keys)
 	}
 
 	converted, ok := raw.(map[string]interface{})

modules/040-node-manager/images/bashible-apiserver/pkg/template/context_builder.go

@@ -235,14 +235,13 @@ func (cb *ContextBuilder) generateBashibleChecksum(checksumCollector hash.Hash,
 		res[k] = v
 	}
 
+	var providerType string
 	cloudProvider, ok := bundleNgContext.CloudProvider.(map[string]interface{})
-	if !ok {
-		// absent cloud provider means static nodes
-		return errors.New("cloud provider has wrong type")
-	}
-	providerType, ok := cloudProvider["type"].(string)
-	if !ok {
-		return fmt.Errorf("cloudProvider.type is not a string")
+	if ok {
+		providerType, ok = cloudProvider["type"].(string)
+		if !ok {
+			return fmt.Errorf("cloudProvider.type is not a string")
+		}
 	}
 
 	// render steps