From 20b5fa18fa766ffedbe1740da076423025aa8402 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Mon, 17 Jun 2024 18:32:55 +0300
Subject: [PATCH 01/40] file .cdevignore with list of yaml files which cdev
 should ignore

---
 internal/project/project_config.go            | 21 ++++++++++++++++++-
 internal/project/stack.go                     | 19 +++++++++++++++++
 tests/test-project/.cdevignore                |  1 +
 tests/test-project/ignore-wrong.yaml          |  4 ++++
 tests/test-project/local-tmpl/.cdevignore     |  1 +
 .../test-project/local-tmpl/ignore-wrong.yaml |  4 ++++
 6 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-project/.cdevignore
 create mode 100644 tests/test-project/ignore-wrong.yaml
 create mode 100644 tests/test-project/local-tmpl/.cdevignore
 create mode 100644 tests/test-project/local-tmpl/ignore-wrong.yaml

diff --git a/internal/project/project_config.go b/internal/project/project_config.go
index 448e195c..ebb7f4bd 100644
--- a/internal/project/project_config.go
+++ b/internal/project/project_config.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 
 	"github.com/apex/log"
 	"github.com/shalb/cluster.dev/internal/config"
@@ -13,6 +14,7 @@ import (
 )
 
 const defaultProjectName = "default-project"
+const ignoreFileName = ".cdevignore"
 
 func (p *Project) parseProjectConfig() error {
 
@@ -60,9 +62,26 @@ func (p *Project) readManifests() (err error) {
 	files = append(files, filesYML...)
 	objFiles := make(map[string][]byte)
 
+	ignoreFileFullPath := filepath.Join(config.Global.WorkingDir, ignoreFileName)
+	ignoreData, _ := os.ReadFile(ignoreFileFullPath) // Ignore error, its ok
+	ignoreList := strings.Split(string(ignoreData), "\n")
+
+	ignoreFileCheck := func(filename string) bool {
+		for _, ignoreFile := range ignoreList {
+			if ignoreFile == filename {
+				return true
+			}
+		}
+		return false
+	}
+
 	for _, file := range files {
-		// log.Warnf("Read Files: %v", file)
+		// log.Warnf("Read Files: %v, list: %v", file, ignoreList)
 		fileName, _ := filepath.Rel(config.Global.WorkingDir, file)
+		if ignoreFileCheck(fileName) {
+			log.Debugf("File ignored: %v", fileName)
+			continue
+		}
 		isProjectConfig := regexp.MustCompile(ConfigFilePattern).MatchString(fileName)
 		if isProjectConfig {
 			p.configDataFile, err = os.ReadFile(file)
diff --git a/internal/project/stack.go b/internal/project/stack.go
index f6ec6b7b..6a6502fd 100644
--- a/internal/project/stack.go
+++ b/internal/project/stack.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/apex/log"
 	"github.com/shalb/cluster.dev/internal/config"
@@ -155,8 +156,26 @@ func (s *Stack) ReadTemplate(src string) (err error) {
 	if err != nil {
 		return err
 	}
+	ignoreFileFullPath := filepath.Join(s.TemplateDir, ignoreFileName)
+	ignoreData, _ := os.ReadFile(ignoreFileFullPath) // Ignore error, its ok
+	ignoreList := strings.Split(string(ignoreData), "\n")
+
+	ignoreFileCheck := func(filename string) bool {
+		for _, ignoreFile := range ignoreList {
+			if ignoreFile == filename {
+				return true
+			}
+		}
+		return false
+	}
 	s.Templates = []stackTemplate{}
 	for _, fn := range templatesFilesList {
+		// if ignoreFileCheck(fn)
+		checkFileName, _ := filepath.Rel(s.TemplateDir, fn)
+		if ignoreFileCheck(checkFileName) {
+			log.Debugf("Ignore stackTemplate file: %v", fn)
+			continue
+		}
 		tmplData, err := os.ReadFile(fn)
 		if err != nil {
 			return err
diff --git a/tests/test-project/.cdevignore b/tests/test-project/.cdevignore
new file mode 100644
index 00000000..76233646
--- /dev/null
+++ b/tests/test-project/.cdevignore
@@ -0,0 +1 @@
+ignore-wrong.yaml
diff --git a/tests/test-project/ignore-wrong.yaml b/tests/test-project/ignore-wrong.yaml
new file mode 100644
index 00000000..b8c9c13b
--- /dev/null
+++ b/tests/test-project/ignore-wrong.yaml
@@ -0,0 +1,4 @@
+foo: bar
+key: val
+
+# Non cdev yaml file, should be ignored with .cdevignore
diff --git a/tests/test-project/local-tmpl/.cdevignore b/tests/test-project/local-tmpl/.cdevignore
new file mode 100644
index 00000000..76233646
--- /dev/null
+++ b/tests/test-project/local-tmpl/.cdevignore
@@ -0,0 +1 @@
+ignore-wrong.yaml
diff --git a/tests/test-project/local-tmpl/ignore-wrong.yaml b/tests/test-project/local-tmpl/ignore-wrong.yaml
new file mode 100644
index 00000000..b8c9c13b
--- /dev/null
+++ b/tests/test-project/local-tmpl/ignore-wrong.yaml
@@ -0,0 +1,4 @@
+foo: bar
+key: val
+
+# Non cdev yaml file, should be ignored with .cdevignore

From d4e499b3d1b150a5eace613311919f1bdcebef16 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 18:38:21 +0300
Subject: [PATCH 02/40] helm provider config, new tests

---
 .github/workflows/pr_tests copy.yml           |  20 +
 internal/units/shell/terraform/helm/main.go   |  44 +-
 .../units/shell/terraform/kubernetes/main.go  |  30 +-
 .../units/shell/terraform/kubernetes/state.go |   5 +-
 .../shell/terraform/types/kube_provider.go    |  30 +
 tests/k8s/kube-helm/.cdevignore               |   1 +
 tests/k8s/kube-helm/deployment.yaml           |  21 +
 tests/k8s/kube-helm/template.yaml             |  44 ++
 tests/k8s/kube-helm/values/consul.yaml        |   1 +
 tests/k8s/project.yml                         |   7 +
 tests/k8s/stack.yaml                          |   7 +
 tests/test-project/README.md                  |  20 -
 tests/test-project/local-tmpl/LICENSE         | 674 ------------------
 13 files changed, 168 insertions(+), 736 deletions(-)
 create mode 100644 .github/workflows/pr_tests copy.yml
 create mode 100644 internal/units/shell/terraform/types/kube_provider.go
 create mode 100644 tests/k8s/kube-helm/.cdevignore
 create mode 100644 tests/k8s/kube-helm/deployment.yaml
 create mode 100644 tests/k8s/kube-helm/template.yaml
 create mode 100644 tests/k8s/kube-helm/values/consul.yaml
 create mode 100644 tests/k8s/project.yml
 create mode 100644 tests/k8s/stack.yaml
 delete mode 100644 tests/test-project/README.md
 delete mode 100644 tests/test-project/local-tmpl/LICENSE

diff --git a/.github/workflows/pr_tests copy.yml b/.github/workflows/pr_tests copy.yml
new file mode 100644
index 00000000..b121314d
--- /dev/null
+++ b/.github/workflows/pr_tests copy.yml	
@@ -0,0 +1,20 @@
+name: Pr Tests
+on:
+  push:
+    branches:
+      - cdev-ignore
+
+jobs:
+  tests:
+    name: Build and run tests
+    runs-on: ubuntu-latest
+    container: golang:1.21.3-alpine
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v2
+
+      - name: Build image
+        run: |
+          set -x
+          ls -la
+          docker ps
diff --git a/internal/units/shell/terraform/helm/main.go b/internal/units/shell/terraform/helm/main.go
index 7996f3ec..48d6bb37 100644
--- a/internal/units/shell/terraform/helm/main.go
+++ b/internal/units/shell/terraform/helm/main.go
@@ -13,6 +13,7 @@ import (
 	"github.com/shalb/cluster.dev/internal/project"
 	"github.com/shalb/cluster.dev/internal/units/shell/common"
 	"github.com/shalb/cluster.dev/internal/units/shell/terraform/base"
+	"github.com/shalb/cluster.dev/internal/units/shell/terraform/types"
 	"github.com/shalb/cluster.dev/pkg/hcltools"
 	"github.com/shalb/cluster.dev/pkg/utils"
 	"github.com/zclconf/go-cty/cty"
@@ -21,15 +22,16 @@ import (
 
 type Unit struct {
 	base.Unit
-	Source          string                   `yaml:"-" json:"source"`
-	HelmOpts        map[string]interface{}   `yaml:"-" json:"helm_opts,omitempty"`
-	Sets            map[string]interface{}   `yaml:"-" json:"sets,omitempty"`
-	Kubeconfig      *string                  `yaml:"-" json:"kubeconfig"`
-	ValuesFilesList []string                 `yaml:"-" json:"values,omitempty"`
-	ValuesYAML      []map[string]interface{} `yaml:"-" json:"-"`
-	UnitKind        string                   `yaml:"-" json:"type"`
-	StateData       project.Unit             `yaml:"-" json:"-"`
-	CustomFiles     *common.FilesListT       `yaml:"create_files,omitempty" json:"create_files,omitempty"`
+	Source          string                    `yaml:"-,omitempty" json:"source"`
+	HelmOpts        map[string]interface{}    `yaml:"-" json:"helm_opts,omitempty"`
+	Sets            map[string]interface{}    `yaml:"-" json:"sets,omitempty"`
+	Kubeconfig      *string                   `yaml:"-" json:"kubeconfig"`
+	ValuesFilesList []string                  `yaml:"-" json:"values,omitempty"`
+	ValuesYAML      []map[string]interface{}  `yaml:"-" json:"-"`
+	UnitKind        string                    `yaml:"-" json:"type"`
+	StateData       project.Unit              `yaml:"-" json:"-"`
+	CustomFiles     *common.FilesListT        `yaml:"create_files,omitempty" json:"create_files,omitempty"`
+	ProviderConf    *types.ProviderConfigSpec `yaml:"provider_conf" json:"provider_conf"`
 }
 
 func (u *Unit) KindKey() string {
@@ -44,13 +46,22 @@ func (u *Unit) genMainCodeBlock() ([]byte, error) {
 	f := hclwrite.NewEmptyFile()
 	providerBody := &hclwrite.Body{}
 	rootBody := f.Body()
-	if u.Kubeconfig != nil {
+	if u.ProviderConf != nil || u.Kubeconfig != nil {
 		providerBlock := rootBody.AppendNewBlock("provider", []string{"helm"})
 		providerBody = providerBlock.Body()
-		provederKubernetesBlock := providerBody.AppendNewBlock("kubernetes", []string{})
-		provederKubernetesBlock.Body().SetAttributeValue("config_path", cty.StringVal(*u.Kubeconfig))
-		if config.Global.LogLevel == "debug" {
-			providerBody.SetAttributeValue("debug", cty.BoolVal(true))
+		providerKubernetesBlock := providerBody.AppendNewBlock("kubernetes", []string{})
+		if u.ProviderConf != nil {
+			providerCty, err := hcltools.InterfaceToCty(*u.ProviderConf)
+			if err != nil {
+				return nil, err
+			}
+			for key, val := range providerCty.AsValueMap() {
+				providerKubernetesBlock.Body().SetAttributeValue(key, val)
+			}
+		}
+		if u.Kubeconfig != nil {
+			log.Warn("Deprecation warning: helm unit option 'kubeconfig' is deprecated. Please use 'provider_conf.config_path' instead.")
+			providerKubernetesBlock.Body().SetAttributeValue("config_path", cty.StringVal(*u.Kubeconfig))
 		}
 	}
 	helmBlock := rootBody.AppendNewBlock("resource", []string{"helm_release", project.ConvertToTfVarName(u.Name())})
@@ -91,7 +102,10 @@ func (u *Unit) genMainCodeBlock() ([]byte, error) {
 }
 
 func (u *Unit) ReadConfig(spec map[string]interface{}, stack *project.Stack) error {
-
+	err := utils.YAMLInterfaceToType(spec, u)
+	if err != nil {
+		return fmt.Errorf("read 'provider_conf': %w", err)
+	}
 	source, ok := spec["source"].(map[string]interface{})
 	if !ok {
 		return fmt.Errorf("read unit config: incorrect unit source, %v", u.Key())
diff --git a/internal/units/shell/terraform/kubernetes/main.go b/internal/units/shell/terraform/kubernetes/main.go
index aedf537e..6b003ca7 100644
--- a/internal/units/shell/terraform/kubernetes/main.go
+++ b/internal/units/shell/terraform/kubernetes/main.go
@@ -13,6 +13,7 @@ import (
 	"github.com/shalb/cluster.dev/pkg/hcltools"
 
 	"github.com/shalb/cluster.dev/internal/project"
+	"github.com/shalb/cluster.dev/internal/units/shell/terraform/types"
 	"github.com/shalb/cluster.dev/pkg/utils"
 )
 
@@ -22,30 +23,9 @@ type Unit struct {
 	Kubeconfig string                 `yaml:"-" json:"kubeconfig"`
 	Inputs     map[string]interface{} `yaml:"-" json:"inputs"`
 	// providerVersion string                 `yaml:"-" json:"-"`
-	ProviderConf ProviderConfigSpec `yaml:"-" json:"provider_conf"`
-	UnitKind     string             `yaml:"-" json:"type"`
-	StateData    project.Unit       `yaml:"-" json:"-"`
-}
-
-type ExecNestedSchema struct {
-	APIVersion string            `yaml:"api_version,omitempty" json:"api_version,omitempty"`
-	Args       []string          `yaml:"args,omitempty" json:"args,omitempty"`
-	Command    string            `yaml:"command,omitempty" json:"command,omitempty"`
-	Env        map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
-}
-
-type ProviderConfigSpec struct {
-	ConfigPath           string            `yaml:"config_path,omitempty" json:"config_path,omitempty"`
-	ClientCertificate    string            `yaml:"client_certificate,omitempty" json:"client_certificate,omitempty"`
-	ConfigContext        string            `yaml:"config_context,omitempty" json:"config_context,omitempty"`
-	ConfigContextCluster string            `yaml:"config_context_cluster,omitempty" json:"config_context_cluster,omitempty"`
-	ConfigContextUser    string            `yaml:"config_context_user,omitempty"  json:"config_context_user,omitempty"`
-	Exec                 *ExecNestedSchema `yaml:"exec,omitempty" json:"exec,omitempty"`
-	Host                 string            `yaml:"host,omitempty" json:"host,omitempty"`
-	Insecure             string            `yaml:"insecure,omitempty" json:"insecure,omitempty"`
-	Password             string            `yaml:"password,omitempty" json:"password,omitempty"`
-	Token                string            `yaml:"token,omitempty" json:"token,omitempty"`
-	Username             string            `yaml:"username,omitempty" json:"username,omitempty"`
+	ProviderConf types.ProviderConfigSpec `yaml:"provider_conf" json:"provider_conf"`
+	UnitKind     string                   `yaml:"-" json:"type"`
+	StateData    project.Unit             `yaml:"-" json:"-"`
 }
 
 func (u *Unit) KindKey() string {
@@ -139,7 +119,7 @@ func (u *Unit) ReadConfig(spec map[string]interface{}, stack *project.Stack) err
 		return fmt.Errorf("the kubernetes unit must contain at least one manifest")
 	}
 
-	err = utils.JSONCopy(spec, &u.ProviderConf)
+	err = utils.YAMLInterfaceToType(spec, u)
 	if err != nil {
 		return err
 	}
diff --git a/internal/units/shell/terraform/kubernetes/state.go b/internal/units/shell/terraform/kubernetes/state.go
index 5569e0e1..62322416 100644
--- a/internal/units/shell/terraform/kubernetes/state.go
+++ b/internal/units/shell/terraform/kubernetes/state.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/shalb/cluster.dev/internal/project"
 	"github.com/shalb/cluster.dev/internal/units/shell/terraform/base"
+	"github.com/shalb/cluster.dev/internal/units/shell/terraform/types"
 	"github.com/shalb/cluster.dev/pkg/utils"
 )
 
@@ -29,8 +30,8 @@ func (u *Unit) GetState() project.Unit {
 
 type UnitDiffSpec struct {
 	base.UnitDiffSpec
-	ProviderConf ProviderConfigSpec `json:"provider_conf"`
-	Inputs       interface{}        `json:"inputs"`
+	ProviderConf types.ProviderConfigSpec `json:"provider_conf"`
+	Inputs       interface{}              `json:"inputs"`
 }
 
 func (u *Unit) GetUnitDiff() UnitDiffSpec {
diff --git a/internal/units/shell/terraform/types/kube_provider.go b/internal/units/shell/terraform/types/kube_provider.go
new file mode 100644
index 00000000..7d2ee274
--- /dev/null
+++ b/internal/units/shell/terraform/types/kube_provider.go
@@ -0,0 +1,30 @@
+package types
+
+type ExecNestedSchema struct {
+	APIVersion string            `yaml:"api_version,omitempty" json:"api_version,omitempty"`
+	Args       []string          `yaml:"args,omitempty" json:"args,omitempty"`
+	Command    string            `yaml:"command,omitempty" json:"command,omitempty"`
+	Env        map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
+}
+
+type ProviderConfigSpec struct {
+	ConfigPath            string            `yaml:"config_path,omitempty" json:"config_path,omitempty"`
+	ConfigPaths           []string          `yaml:"config_paths,omitempty" json:"config_paths,omitempty"`
+	ClientCertificate     string            `yaml:"client_certificate,omitempty" json:"client_certificate,omitempty"`
+	ClientKey             string            `yaml:"client_key,omitempty" json:"client_key,omitempty"`
+	ClusterCaCertificate  string            `yaml:"cluster_ca_certificate,omitempty" json:"cluster_ca_certificate,omitempty"`
+	ConfigContext         string            `yaml:"config_context,omitempty" json:"config_context,omitempty"`
+	ConfigContextCluster  string            `yaml:"config_context_cluster,omitempty" json:"config_context_cluster,omitempty"`
+	ConfigContextUser     string            `yaml:"config_context_user,omitempty"  json:"config_context_user,omitempty"`
+	ConfigContextAuthInfo string            `yaml:"config_context_auth_info,omitempty"  json:"config_context_auth_info,omitempty"`
+	ProxyURL              string            `yaml:"proxy_url,omitempty"  json:"proxy_url,omitempty"`
+	Exec                  *ExecNestedSchema `yaml:"exec,omitempty" json:"exec,omitempty"`
+	Host                  string            `yaml:"host,omitempty" json:"host,omitempty"`
+	Insecure              string            `yaml:"insecure,omitempty" json:"insecure,omitempty"`
+	Password              string            `yaml:"password,omitempty" json:"password,omitempty"`
+	Token                 string            `yaml:"token,omitempty" json:"token,omitempty"`
+	Username              string            `yaml:"username,omitempty" json:"username,omitempty"`
+	IgnoreAnnotations     string            `yaml:"ignore_annotations,omitempty" json:"ignore_annotations,omitempty"`
+	IgnoreLabels          string            `yaml:"ignore_labels,omitempty" json:"ignore_labels,omitempty"`
+	TlsServerName         string            `yaml:"tls_server_name,omitempty" json:"tls_server_name,omitempty"`
+}
diff --git a/tests/k8s/kube-helm/.cdevignore b/tests/k8s/kube-helm/.cdevignore
new file mode 100644
index 00000000..c9beae8e
--- /dev/null
+++ b/tests/k8s/kube-helm/.cdevignore
@@ -0,0 +1 @@
+deployment.yaml
diff --git a/tests/k8s/kube-helm/deployment.yaml b/tests/k8s/kube-helm/deployment.yaml
new file mode 100644
index 00000000..685c17aa
--- /dev/null
+++ b/tests/k8s/kube-helm/deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    app: nginx
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.14.2
+        ports:
+        - containerPort: 80
diff --git a/tests/k8s/kube-helm/template.yaml b/tests/k8s/kube-helm/template.yaml
new file mode 100644
index 00000000..7828e9b3
--- /dev/null
+++ b/tests/k8s/kube-helm/template.yaml
@@ -0,0 +1,44 @@
+_p: &provider_aws
+- aws:
+    region: {{ .variables.region }}
+
+name: local-template
+kind: StackTemplate
+cliVersion: "~>0.9.2"
+units:
+  -
+    name: consul
+    type: helm
+    source:
+      repository: "https://charts.bitnami.com/bitnami"
+      chart: "consul"
+      version: "10.9.12"
+    kubeconfig: /home/kk
+    provider_conf:
+      config_path: /home/user/.kube/config
+      cluster_ca_certificate: |
+        asdasd
+        asd
+        asd
+        asdasdasd
+    additional_options:
+      namespace: default
+      create_namespace: true
+    values:
+      - file: ./values/consul.yaml
+  -
+    name: cert-manager-issuer
+    type: kubernetes
+    source: ./deployment.yaml
+    provider_conf:
+      config_paths:
+        - ./deployment.yaml
+      host: k8s.example.com
+      username: "user"
+      password: "secretPassword"
+  -
+    name: outputs
+    type: printer
+    outputs:
+      new_output: "test2"
+
diff --git a/tests/k8s/kube-helm/values/consul.yaml b/tests/k8s/kube-helm/values/consul.yaml
new file mode 100644
index 00000000..2d20f5bd
--- /dev/null
+++ b/tests/k8s/kube-helm/values/consul.yaml
@@ -0,0 +1 @@
+kind: deployment
diff --git a/tests/k8s/project.yml b/tests/k8s/project.yml
new file mode 100644
index 00000000..aa456fad
--- /dev/null
+++ b/tests/k8s/project.yml
@@ -0,0 +1,7 @@
+name: dev
+kind: Project
+backend: default
+variables:
+  organization: cluster-dev
+exports:
+  CDEV_COLLECT_USAGE_STATS: "false"
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
new file mode 100644
index 00000000..cf108251
--- /dev/null
+++ b/tests/k8s/stack.yaml
@@ -0,0 +1,7 @@
+name: kube-helm
+template: ./kube-helm/
+kind: Stack
+disabled: false
+backend: default
+variables: {}
+
diff --git a/tests/test-project/README.md b/tests/test-project/README.md
deleted file mode 100644
index a7357087..00000000
--- a/tests/test-project/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# AWS K3s ArgoCD cdev Sample
-
-The sample project which deploys k3s cluster in AWS, using existing or created VPC and domain name.
-
-## Infra Diagram
-
-
-## Prerequisites
-
-1. Terraform 13+
-2. AWS account.
-3. kubectl installed.
-4. cdev installed.
-
-## Quick Start
-
-1. Install cdev.
-2. Clone project to localhost.
-3. Edit variables in edit fields.
-4. Run `cdev apply`.
diff --git a/tests/test-project/local-tmpl/LICENSE b/tests/test-project/local-tmpl/LICENSE
deleted file mode 100644
index f288702d..00000000
--- a/tests/test-project/local-tmpl/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

From 99cf63ebca379bfafe9002b3f5ab13e9d866945a Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 18:40:56 +0300
Subject: [PATCH 03/40] fix

---
 .github/workflows/{pr_tests copy.yml => extended-.yml} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename .github/workflows/{pr_tests copy.yml => extended-.yml} (76%)

diff --git a/.github/workflows/pr_tests copy.yml b/.github/workflows/extended-.yml
similarity index 76%
rename from .github/workflows/pr_tests copy.yml
rename to .github/workflows/extended-.yml
index b121314d..1e1cbdb4 100644
--- a/.github/workflows/pr_tests copy.yml	
+++ b/.github/workflows/extended-.yml
@@ -1,4 +1,4 @@
-name: Pr Tests
+name: k8s tests
 on:
   push:
     branches:
@@ -6,9 +6,8 @@ on:
 
 jobs:
   tests:
-    name: Build and run tests
+    name: Check dnd
     runs-on: ubuntu-latest
-    container: golang:1.21.3-alpine
     steps:
       - name: Code checkout
         uses: actions/checkout@v2

From eb2d23aff14e7b32f51e16ae346007640b0073d1 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 18:42:36 +0300
Subject: [PATCH 04/40] alpine docker

---
 .github/workflows/extended-.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/extended-.yml b/.github/workflows/extended-.yml
index 1e1cbdb4..024ef76c 100644
--- a/.github/workflows/extended-.yml
+++ b/.github/workflows/extended-.yml
@@ -1,4 +1,4 @@
-name: k8s tests
+name: k8s
 on:
   push:
     branches:
@@ -8,12 +8,15 @@ jobs:
   tests:
     name: Check dnd
     runs-on: ubuntu-latest
+    container: golang:1.21.3-alpine
     steps:
       - name: Code checkout
         uses: actions/checkout@v2
 
       - name: Build image
         run: |
+          apk update
+          apk add docker
           set -x
           ls -la
           docker ps

From c0ae6a73410000f0d4b5626e3e7f1b280b120ccc Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:01:50 +0300
Subject: [PATCH 05/40] next step

---
 .github/workflows/{extended-.yml => extended-tests.yml} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename .github/workflows/{extended-.yml => extended-tests.yml} (68%)

diff --git a/.github/workflows/extended-.yml b/.github/workflows/extended-tests.yml
similarity index 68%
rename from .github/workflows/extended-.yml
rename to .github/workflows/extended-tests.yml
index 024ef76c..323a7157 100644
--- a/.github/workflows/extended-.yml
+++ b/.github/workflows/extended-tests.yml
@@ -16,7 +16,10 @@ jobs:
       - name: Build image
         run: |
           apk update
-          apk add docker
+          apk add docker make terraform git curl bash
+          git config --global --add safe.directory
+          make quick-install
+          cdev version
           set -x
           ls -la
           docker ps

From 4f170ca73614a83d41c165b3e14e942ebe1d6f28 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:04:16 +0300
Subject: [PATCH 06/40] fix

---
 .github/workflows/extended-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 323a7157..63545a2c 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -17,7 +17,6 @@ jobs:
         run: |
           apk update
           apk add docker make terraform git curl bash
-          git config --global --add safe.directory
           make quick-install
           cdev version
           set -x

From bb54be25cc462977543b911555c40b96cb3b4d7e Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:07:02 +0300
Subject: [PATCH 07/40] fix2

---
 .github/workflows/extended-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 63545a2c..6aaac9f1 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -17,7 +17,8 @@ jobs:
         run: |
           apk update
           apk add docker make terraform git curl bash
-          make quick-install
+          git config --global --add safe.directory /__w/cluster.dev/cluster.dev
+          git fetch --prune --unshallow --tags && make quick-install
           cdev version
           set -x
           ls -la

From 472c92a64d39f5b312baf89aacac393e286246e8 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:08:34 +0300
Subject: [PATCH 08/40] build fix

---
 .github/workflows/extended-tests.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 6aaac9f1..6f00df28 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -10,16 +10,18 @@ jobs:
     runs-on: ubuntu-latest
     container: golang:1.21.3-alpine
     steps:
-      - name: Code checkout
-        uses: actions/checkout@v2
+    - name: Code checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
 
-      - name: Build image
-        run: |
-          apk update
-          apk add docker make terraform git curl bash
-          git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-          git fetch --prune --unshallow --tags && make quick-install
-          cdev version
-          set -x
-          ls -la
-          docker ps
+    - name: Build image
+      run: |
+        apk update
+        apk add docker make terraform git curl bash
+        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
+        git fetch --prune --unshallow --tags && make quick-install
+        cdev version
+        set -x
+        ls -la
+        docker ps

From 39b91bfb48cbf878fd74ba9551c0ec474134170c Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:11:44 +0300
Subject: [PATCH 09/40] check

---
 .github/workflows/extended-tests.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 6f00df28..98ac83ba 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -19,9 +19,11 @@ jobs:
       run: |
         apk update
         apk add docker make terraform git curl bash
-        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        git fetch --prune --unshallow --tags && make quick-install
-        cdev version
-        set -x
+        pwd
         ls -la
-        docker ps
+        # git config --global --add safe.directory /__w/cluster.dev/cluster.dev
+        # git fetch --prune --unshallow --tags && make quick-install
+        # cdev version
+        # set -x
+        # ls -la
+        # docker ps

From 99fe8cbd98cee05abe6203f7dd3ff064754b6e9a Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:13:47 +0300
Subject: [PATCH 10/40] check fix

---
 .github/workflows/extended-tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 98ac83ba..947206c2 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -17,13 +17,13 @@ jobs:
 
     - name: Build image
       run: |
+        set -x
         apk update
         apk add docker make terraform git curl bash
         pwd
         ls -la
-        # git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        # git fetch --prune --unshallow --tags && make quick-install
+        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
+        git fetch --prune --unshallow --tags
+        make quick-install
         # cdev version
-        # set -x
-        # ls -la
         # docker ps

From dd502ccacb258adc28b131dcbaaabd3e9eb2f5c8 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:14:50 +0300
Subject: [PATCH 11/40] fix

---
 .github/workflows/extended-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 947206c2..c51ab9fe 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -23,7 +23,6 @@ jobs:
         pwd
         ls -la
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        git fetch --prune --unshallow --tags
         make quick-install
-        # cdev version
+        cdev version
         # docker ps

From 0ed81ebb18eb4e5c11129cdcff5518d59c6a8033 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:19:40 +0300
Subject: [PATCH 12/40] fix10

---
 .github/workflows/extended-tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index c51ab9fe..e787b301 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -7,7 +7,6 @@ on:
 jobs:
   tests:
     name: Check dnd
-    runs-on: ubuntu-latest
     container: golang:1.21.3-alpine
     steps:
     - name: Code checkout
@@ -24,5 +23,5 @@ jobs:
         ls -la
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         make quick-install
-        cdev version
+        # cdev version
         # docker ps

From a317935945c3344f24c9916d2f7e8728d8e2a37f Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:22:31 +0300
Subject: [PATCH 13/40] test 100500

---
 .github/workflows/extended-tests.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index e787b301..fbb8e79f 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -6,22 +6,17 @@ on:
 
 jobs:
   tests:
-    name: Check dnd
+    name: Test branch
+    runs-on: ubuntu-latest
     container: golang:1.21.3-alpine
     steps:
+
     - name: Code checkout
       uses: actions/checkout@v2
       with:
         fetch-depth: 2
 
-    - name: Build image
+    - name: Build
       run: |
-        set -x
-        apk update
-        apk add docker make terraform git curl bash
-        pwd
-        ls -la
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        make quick-install
-        # cdev version
-        # docker ps
+        git fetch --prune --unshallow --tags && make && cp ./bin/linux-amd64/cdev /usr/local/bin/

From 44c3f649a305b6a7babb54dfd68bdebec80496bd Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:27:28 +0300
Subject: [PATCH 14/40] fix try

---
 .github/workflows/extended-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index fbb8e79f..4ac5f448 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -4,6 +4,10 @@ on:
     branches:
       - cdev-ignore
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   tests:
     name: Test branch

From 302255e4e797f1e3c717f278b367e51a8a918c5e Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:29:00 +0300
Subject: [PATCH 15/40] fix try

---
 .github/workflows/extended-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 4ac5f448..60b4b2a8 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -18,6 +18,7 @@ jobs:
     - name: Code checkout
       uses: actions/checkout@v2
       with:
+        token: ${{ secrets.GITHUB_TOKEN }}
         fetch-depth: 2
 
     - name: Build

From 3d79f446283241f6be12ec0bdf27ce590bfea8ec Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:33:33 +0300
Subject: [PATCH 16/40] real fix

---
 .github/workflows/extended-tests.yml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 60b4b2a8..a4806849 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -4,24 +4,34 @@ on:
     branches:
       - cdev-ignore
 
-permissions:
-  contents: read
-  pull-requests: write
-
 jobs:
   tests:
-    name: Test branch
+    name: Check dnd
     runs-on: ubuntu-latest
     container: golang:1.21.3-alpine
     steps:
 
+    - name: Install soft
+      run: |
+        apk add make bash jq curl git zip
+        wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip
+        unzip terraform_1.4.4_linux_amd64.zip
+        cp terraform /usr/local/bin/
+
     - name: Code checkout
       uses: actions/checkout@v2
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
         fetch-depth: 2
 
-    - name: Build
+    - name: Build image
       run: |
+        set -x
+        apk update
+        apk add docker make terraform git curl bash
+        pwd
+        ls -la
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        git fetch --prune --unshallow --tags && make && cp ./bin/linux-amd64/cdev /usr/local/bin/
+        git fetch --prune --unshallow --tags
+        make quick-install
+        cdev version
+        # docker ps

From 191a43ed414e6ebc33cd113d5daa49f53467e9e2 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:37:05 +0300
Subject: [PATCH 17/40] install cdev

---
 .github/workflows/extended-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index a4806849..0dbfd877 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -32,6 +32,6 @@ jobs:
         ls -la
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
-        make quick-install
+        make install
         cdev version
         # docker ps

From 518aabd94e95860e7dc4ae7d4028334602815bf1 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:45:33 +0300
Subject: [PATCH 18/40] create cluster

---
 .github/workflows/extended-tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 0dbfd877..dfd8fa7a 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -27,11 +27,11 @@ jobs:
       run: |
         set -x
         apk update
-        apk add docker make terraform git curl bash
-        pwd
-        ls -la
+        apk add docker make terraform git curl bash kubectl helm
+        curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
         make install
-        cdev version
+        k3d cluster create test
+        kubectl get nodes
         # docker ps

From 9e8ef6bc6d7c1c707be033e1b108cdaae96ac4b6 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 19:53:17 +0300
Subject: [PATCH 19/40] install fix

---
 .github/workflows/extended-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index dfd8fa7a..22195661 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -27,7 +27,9 @@ jobs:
       run: |
         set -x
         apk update
-        apk add docker make terraform git curl bash kubectl helm
+        apk add docker make terraform git curl bash helm
+        curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+        install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
         curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags

From 4c1ceea80370d8830ae4d1503f4260f8e9ec2653 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:00:39 +0300
Subject: [PATCH 20/40] k3d action

---
 .github/workflows/extended-tests.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 22195661..7a7251f7 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -23,6 +23,9 @@ jobs:
       with:
         fetch-depth: 2
 
+    - uses: rinx/setup-k3d@v0.0.2
+      name: install k3d
+
     - name: Build image
       run: |
         set -x
@@ -30,10 +33,8 @@ jobs:
         apk add docker make terraform git curl bash helm
         curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
         install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-        curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
         make install
-        k3d cluster create test
         kubectl get nodes
         # docker ps

From 251668a26feba3e844d4b720c7827418cb09d163 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:25:55 +0300
Subject: [PATCH 21/40] check docker

---
 .github/workflows/extended-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 7a7251f7..ae59acaf 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -35,6 +35,6 @@ jobs:
         install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
-        make install
-        kubectl get nodes
+        # make install
+        docker ps
         # docker ps

From 217ff3edac380c769b3da26e33f20e8fe52bf323 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:28:14 +0300
Subject: [PATCH 22/40] kubeconfig check

---
 .github/workflows/extended-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index ae59acaf..249d5c42 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -37,4 +37,5 @@ jobs:
         git fetch --prune --unshallow --tags
         # make install
         docker ps
+        cat ~/.kube/config
         # docker ps

From cfde658fad317308a296f45ecce92a19780f9123 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:40:23 +0300
Subject: [PATCH 23/40] fix

---
 .github/workflows/extended-tests.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 249d5c42..cb32b0a0 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -8,7 +8,7 @@ jobs:
   tests:
     name: Check dnd
     runs-on: ubuntu-latest
-    container: golang:1.21.3-alpine
+    # container: golang:1.21.3-alpine
     steps:
 
     - name: Install soft
@@ -26,7 +26,12 @@ jobs:
     - uses: rinx/setup-k3d@v0.0.2
       name: install k3d
 
+    - name: Get cluster info
+      run: |
+        kubectl cluster-info
+
     - name: Build image
+      image: golang:1.21.3-alpine
       run: |
         set -x
         apk update

From c227dc9df318c560b5be7f5aa38fb07ff9e468f0 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:54:49 +0300
Subject: [PATCH 24/40] fix fin

---
 .github/workflows/extended-tests.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index cb32b0a0..43206dd5 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -13,10 +13,9 @@ jobs:
 
     - name: Install soft
       run: |
-        apk add make bash jq curl git zip
-        wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip
-        unzip terraform_1.4.4_linux_amd64.zip
-        cp terraform /usr/local/bin/
+        apk add make bash jq curl git zip terraform
+        curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+        install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
     - name: Code checkout
       uses: actions/checkout@v2
@@ -30,17 +29,12 @@ jobs:
       run: |
         kubectl cluster-info
 
-    - name: Build image
-      image: golang:1.21.3-alpine
+    - name: Build cdev
       run: |
-        set -x
-        apk update
-        apk add docker make terraform git curl bash helm
-        curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-        install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        git fetch --prune --unshallow --tags
-        # make install
-        docker ps
-        cat ~/.kube/config
-        # docker ps
+        cp Dockerfile-alpine Dockerfile
+        docker build -t tmp-cdev:latest .
+        id=$(docker create tmp-cdev:latest)
+        docker cp $id:/bin/cdev /usr/local/bin/
+        docker rm -v $id
+        cdev -v
+        kubectl get node

From 928febc4d3193b5ace77461b9bf101c712e2ef45 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 20:58:47 +0300
Subject: [PATCH 25/40] ubuntu install

---
 .github/workflows/extended-tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 43206dd5..06c40771 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -13,9 +13,13 @@ jobs:
 
     - name: Install soft
       run: |
-        apk add make bash jq curl git zip terraform
+        apt update
+        apt install -y make jq curl git zip
         curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
         install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+        wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip
+        unzip terraform_1.4.4_linux_amd64.zip
+        cp terraform /usr/local/bin/
 
     - name: Code checkout
       uses: actions/checkout@v2

From 8eb04a767c1b91153bc84c5d4d1aa2ef2c618721 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 21:00:24 +0300
Subject: [PATCH 26/40] sudo added

---
 .github/workflows/extended-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index 06c40771..d20e6316 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -13,8 +13,8 @@ jobs:
 
     - name: Install soft
       run: |
-        apt update
-        apt install -y make jq curl git zip
+        sudo apt update
+        sudo apt install -y make jq curl git zip
         curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
         install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
         wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip

From 5dfc6ddc096e8dce565af41acdb5313a7f97f9b5 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Tue, 18 Jun 2024 21:01:31 +0300
Subject: [PATCH 27/40] more sudo

---
 .github/workflows/extended-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/extended-tests.yml
index d20e6316..10fdb4e8 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/extended-tests.yml
@@ -16,10 +16,10 @@ jobs:
         sudo apt update
         sudo apt install -y make jq curl git zip
         curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-        install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+        sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
         wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip
         unzip terraform_1.4.4_linux_amd64.zip
-        cp terraform /usr/local/bin/
+        sudo cp terraform /usr/local/bin/
 
     - name: Code checkout
       uses: actions/checkout@v2

From 34c5387cd821d96ed9ac5f77fedd199054203fd3 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 13:27:23 +0300
Subject: [PATCH 28/40] issues: #267 #269 #268 #259 #257

---
 internal/cmd/cdev/apply.go                 |  2 +-
 internal/cmd/cdev/destroy.go               |  2 +-
 internal/project/commands.go               |  4 +---
 internal/project/helpers.go                | 20 --------------------
 internal/project/project.go                |  7 +++----
 internal/project/state.go                  |  3 +--
 internal/project/ui/generator.go           |  6 +++++-
 internal/project/ulinks.go                 |  6 +-----
 internal/secrets/aws_secretmanager/main.go |  2 +-
 internal/secrets/sops/main.go              |  4 ++--
 internal/units/shell/common/unit.go        |  3 +--
 pkg/utils/files.go                         | 20 ++++++++++++++++++++
 pkg/utils/stats_collector.go               |  2 +-
 tests/k8s/kube-helm/deployment.yaml        |  4 ++--
 tests/k8s/kube-helm/template.yaml          | 17 +++--------------
 tests/k8s/kube-helm/values/consul.yaml     |  3 ++-
 tests/k8s/stack.yaml                       | 10 +++++++++-
 17 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/internal/cmd/cdev/apply.go b/internal/cmd/cdev/apply.go
index e81ce851..a49b1914 100644
--- a/internal/cmd/cdev/apply.go
+++ b/internal/cmd/cdev/apply.go
@@ -23,10 +23,10 @@ var applyCmd = &cobra.Command{
 			return NewCmdErr(project, "apply", err)
 		}
 		err = project.LockState()
-		defer project.UnLockState()
 		if err != nil {
 			return NewCmdErr(project, "apply", err)
 		}
+		defer project.UnLockState()
 		err = project.Apply()
 		if err != nil {
 			return NewCmdErr(project, "apply", err)
diff --git a/internal/cmd/cdev/destroy.go b/internal/cmd/cdev/destroy.go
index a3db2939..c5f941ed 100644
--- a/internal/cmd/cdev/destroy.go
+++ b/internal/cmd/cdev/destroy.go
@@ -18,10 +18,10 @@ var destroyCmd = &cobra.Command{
 			return NewCmdErr(project, "destroy", err)
 		}
 		err = project.LockState()
-		defer project.UnLockState()
 		if err != nil {
 			return NewCmdErr(project, "destroy", err)
 		}
+		defer project.UnLockState()
 		err = project.Destroy()
 		if err != nil {
 			return NewCmdErr(project, "destroy", err)
diff --git a/internal/project/commands.go b/internal/project/commands.go
index a30389b4..507559eb 100644
--- a/internal/project/commands.go
+++ b/internal/project/commands.go
@@ -111,6 +111,7 @@ func (p *Project) StartSigTrap(stop chan struct{}) {
 				os.Exit(0)
 			case <-stop:
 				close(p.HupUnlockChan)
+				signal.Stop(p.HupUnlockChan)
 				return
 			}
 		}
@@ -200,10 +201,7 @@ func applyRoutine(graphUnit *UnitPlanningStatus, finFunc func(error), p *Project
 	p.ProcessedUnitsCount++
 	err = graphUnit.UnitPtr.Apply()
 	if err != nil {
-		state, _ := utils.JSONEncode(graphUnit.UnitPtr)
-		log.Warnf("applyRoutine: %v", string(state))
 		if graphUnit.UnitPtr.IsTainted() {
-			// log.Warnf("applyRoutine: tainted %v", graphUnit.UnitPtr.Key())
 			p.OwnState.UpdateUnit(graphUnit.UnitPtr)
 		}
 		finFunc(fmt.Errorf("apply unit: %v", err.Error()))
diff --git a/internal/project/helpers.go b/internal/project/helpers.go
index 2db31f3d..b4157488 100644
--- a/internal/project/helpers.go
+++ b/internal/project/helpers.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 	"reflect"
 	"regexp"
 	"strings"
@@ -234,25 +233,6 @@ func printVersion() string {
 	return config.Global.Version
 }
 
-func removeDirContent(dir string) error {
-	d, err := os.Open(dir)
-	if err != nil {
-		return err
-	}
-	defer d.Close()
-	names, err := d.Readdirnames(-1)
-	if err != nil {
-		return err
-	}
-	for _, name := range names {
-		err = os.RemoveAll(filepath.Join(dir, name))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // ScanMarkers use marker scanner function to replace templated markers.
 func ScanMarkers(data interface{}, procFunc MarkerScanner, unit Unit) error {
 	if data == nil {
diff --git a/internal/project/project.go b/internal/project/project.go
index 454b9ce7..53239ce6 100644
--- a/internal/project/project.go
+++ b/internal/project/project.go
@@ -79,7 +79,6 @@ func NewEmptyProject() *Project {
 	log.Info("Checking for newer releases...")
 	err := DiscoverCdevLastRelease()
 	if err != nil {
-		log.Warnf("Version check: %v.", err)
 		project.NewVersionMessage = fmt.Sprintf("Version check: %v", err.Error())
 	}
 	return project
@@ -273,16 +272,16 @@ func (p *Project) ClearCacheDir() error {
 		return nil
 	}
 	if !config.Global.UseCache {
-		log.Debugf("Removes all old content: './%s'", relPath)
+		log.Debugf("Removes all old content: './%s'", p.CodeCacheDir)
 
-		err := removeDirContent(p.CodeCacheDir)
+		err := utils.RemoveDirContent(p.CodeCacheDir)
 		if err != nil {
 			return err
 		}
 		if _, err := os.Stat(config.Global.TemplatesCacheDir); os.IsNotExist(err) {
 			return nil
 		}
-		return removeDirContent(config.Global.TemplatesCacheDir)
+		return utils.RemoveDirContent(config.Global.TemplatesCacheDir)
 	}
 	return nil
 }
diff --git a/internal/project/state.go b/internal/project/state.go
index 81d5b69f..533b28b1 100644
--- a/internal/project/state.go
+++ b/internal/project/state.go
@@ -57,7 +57,6 @@ func (p *Project) SaveState() error {
 	}
 	// log.Errorf("units links: %+v\n Project: %+v", st.UnitLinks, p.UnitLinks)
 	for key, unit := range p.Units {
-		log.Warnf("SaveState %v", key)
 		st.Units[key] = unit.GetState()
 	}
 	// Remove all unit links, that not have a target unit.
@@ -192,7 +191,7 @@ func (p *Project) LoadState() (*StateProject, error) {
 			return nil, fmt.Errorf("load state: create state cache dir: %w", err)
 		}
 	}
-	err := removeDirContent(config.Global.StateCacheDir)
+	err := utils.RemoveDirContent(config.Global.StateCacheDir)
 	if err != nil {
 		return nil, fmt.Errorf("load state: remove state cache dir: %w", err)
 	}
diff --git a/internal/project/ui/generator.go b/internal/project/ui/generator.go
index 957bad56..a73fcd12 100644
--- a/internal/project/ui/generator.go
+++ b/internal/project/ui/generator.go
@@ -408,7 +408,11 @@ func ClearScreen() {
 
 func GetTemplateGenerators(tmplSrc string) (tmplDir string, err error) {
 	if !config.Global.UseCache {
-		os.RemoveAll(config.Global.TemplatesCacheDir)
+		utils.RemoveDirContent(config.Global.TemplatesCacheDir)
+		err = os.Remove(config.Global.TemplatesCacheDir)
+		if err != nil {
+			return
+		}
 	}
 	err = os.MkdirAll(config.Global.TemplatesCacheDir, os.ModePerm)
 	if err != nil {
diff --git a/internal/project/ulinks.go b/internal/project/ulinks.go
index 62e325a3..3d60c4fa 100644
--- a/internal/project/ulinks.go
+++ b/internal/project/ulinks.go
@@ -3,8 +3,6 @@ package project
 import (
 	"fmt"
 	"sync"
-
-	"github.com/apex/log"
 )
 
 // ULinkT describe unit link betwen one target unit and multiple cli units, which uses this unit (output or remote state, or custom unit dependency).
@@ -214,9 +212,7 @@ func (o *UnitLinksT) UniqUnits() map[string]Unit {
 		if unit != nil {
 			continue
 		}
-		if el.Unit == nil {
-			log.Warnf("Dev debug. Nil unit pointer %v. Pls check.", el.UnitKey())
-		}
+
 		res[el.UnitKey()] = el.Unit
 	}
 	return res
diff --git a/internal/secrets/aws_secretmanager/main.go b/internal/secrets/aws_secretmanager/main.go
index 543f51d5..3fca83f0 100644
--- a/internal/secrets/aws_secretmanager/main.go
+++ b/internal/secrets/aws_secretmanager/main.go
@@ -111,7 +111,7 @@ func (s *smDriver) Create(files map[string][]byte) error {
 		command := fmt.Sprintf("%s %s", editor, filename)
 		err = runner.RunWithTty(command)
 		if err != nil {
-			os.RemoveAll(filename)
+			os.Remove(filename)
 			return fmt.Errorf("secrets: create secret: %v", err.Error())
 		}
 	}
diff --git a/internal/secrets/sops/main.go b/internal/secrets/sops/main.go
index 19db82e6..faaa16cd 100644
--- a/internal/secrets/sops/main.go
+++ b/internal/secrets/sops/main.go
@@ -85,13 +85,13 @@ func (s *sopsDriver) Create(files map[string][]byte) error {
 		command := fmt.Sprintf("sops -e --encrypted-regex ^encrypted_data$ -i %s", filename)
 		err = runner.RunWithTty(command)
 		if err != nil {
-			os.RemoveAll(filename)
+			os.Remove(filename)
 			return fmt.Errorf("create sops secret: %v", err.Error())
 		}
 		command = fmt.Sprintf("sops %s", filename)
 		err = runner.RunWithTty(command)
 		if err != nil && err.Error() != "exit status 200" {
-			os.RemoveAll(filename)
+			os.Remove(filename)
 			log.Debugf("err %+v", err)
 			return fmt.Errorf("create sops secret: %v", err.Error())
 		}
diff --git a/internal/units/shell/common/unit.go b/internal/units/shell/common/unit.go
index a305db50..fbff3973 100644
--- a/internal/units/shell/common/unit.go
+++ b/internal/units/shell/common/unit.go
@@ -81,9 +81,8 @@ type Unit struct {
 func (u *Unit) SetTainted(newValue bool, err error) {
 	u.Tainted = newValue
 	u.ExecErr = err
-	log.Warnf("SetTainted %v", u.Key())
 	if u.SavedState != nil {
-		log.Warnf("SetTainted %v", u.SavedState.Key())
+		log.Debugf("SetTainted %v", u.SavedState.Key())
 		u.SavedState.SetTainted(newValue, err)
 	}
 }
diff --git a/pkg/utils/files.go b/pkg/utils/files.go
index 0cbddc59..171fb061 100644
--- a/pkg/utils/files.go
+++ b/pkg/utils/files.go
@@ -220,3 +220,23 @@ func CopySymLink(source, dest string) error {
 	}
 	return os.Symlink(link, dest)
 }
+
+func RemoveDirContent(dir string) error {
+	// log.Warnf("removeDirContent: %v", dir)
+	d, err := os.Open(dir)
+	if err != nil {
+		return err
+	}
+	defer d.Close()
+	names, err := d.Readdirnames(-1)
+	if err != nil {
+		return err
+	}
+	for _, name := range names {
+		err = os.RemoveAll(filepath.Join(dir, name))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/utils/stats_collector.go b/pkg/utils/stats_collector.go
index 43dac57d..1e51b017 100644
--- a/pkg/utils/stats_collector.go
+++ b/pkg/utils/stats_collector.go
@@ -49,7 +49,7 @@ func (e *StatsExporter) PushStats(stats interface{}) error {
 	log.Debugf("Usage stats:\n%v", string(jsonBody))
 	res, err := client.Do(req)
 	if err != nil {
-		log.Warnf("Cant push usage stats: client: error making http request: %s\n", err)
+		log.Warnf("Can't push usage stats: client: error making http request: %s\n", err)
 		return err
 	}
 	respondBody, err := io.ReadAll(res.Body)
diff --git a/tests/k8s/kube-helm/deployment.yaml b/tests/k8s/kube-helm/deployment.yaml
index 685c17aa..3ae75af3 100644
--- a/tests/k8s/kube-helm/deployment.yaml
+++ b/tests/k8s/kube-helm/deployment.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: nginx-deployment
+  name: {{ .variables.nginx.name_override | default "nginx-deployment" }}
   labels:
     app: nginx
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: nginx
diff --git a/tests/k8s/kube-helm/template.yaml b/tests/k8s/kube-helm/template.yaml
index 7828e9b3..6c3479e8 100644
--- a/tests/k8s/kube-helm/template.yaml
+++ b/tests/k8s/kube-helm/template.yaml
@@ -13,29 +13,18 @@ units:
       repository: "https://charts.bitnami.com/bitnami"
       chart: "consul"
       version: "10.9.12"
-    kubeconfig: /home/kk
-    provider_conf:
-      config_path: /home/user/.kube/config
-      cluster_ca_certificate: |
-        asdasd
-        asd
-        asd
-        asdasdasd
+    provider_conf: {{ insertYAML .variables.k8s_conf }}
     additional_options:
       namespace: default
       create_namespace: true
     values:
       - file: ./values/consul.yaml
+        apply_template: true
   -
     name: cert-manager-issuer
     type: kubernetes
     source: ./deployment.yaml
-    provider_conf:
-      config_paths:
-        - ./deployment.yaml
-      host: k8s.example.com
-      username: "user"
-      password: "secretPassword"
+    provider_conf: {{ insertYAML .variables.k8s_conf }}
   -
     name: outputs
     type: printer
diff --git a/tests/k8s/kube-helm/values/consul.yaml b/tests/k8s/kube-helm/values/consul.yaml
index 2d20f5bd..00184da2 100644
--- a/tests/k8s/kube-helm/values/consul.yaml
+++ b/tests/k8s/kube-helm/values/consul.yaml
@@ -1 +1,2 @@
-kind: deployment
+replicaCount: 1
+fullnameOverride: {{ .variables.consul.name_override | default "consul" }}
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
index cf108251..190afd26 100644
--- a/tests/k8s/stack.yaml
+++ b/tests/k8s/stack.yaml
@@ -3,5 +3,13 @@ template: ./kube-helm/
 kind: Stack
 disabled: false
 backend: default
-variables: {}
+variables:
+  k8s_conf:
+    config_path: "~/.kube/config"
+    config_context: "k3d-test"
+  consul:
+    name_override: renamed-consul
+  nginx:
+    name_override: renamed-nginx
+
 

From 3fd09802b7d4b2995764877f2c961c1b08351233 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 13:44:21 +0300
Subject: [PATCH 29/40] new tests on push

---
 .../{extended-tests.yml => tests.yml}         | 24 +++++++++++--------
 tests/k8s/kube-helm/template.yaml             |  8 +++----
 tests/k8s/kube-helm/values/consul.yaml        |  2 --
 tests/k8s/kube-helm/values/redis.yaml         |  6 +++++
 tests/k8s/stack.yaml                          |  2 +-
 5 files changed, 25 insertions(+), 17 deletions(-)
 rename .github/workflows/{extended-tests.yml => tests.yml} (64%)
 delete mode 100644 tests/k8s/kube-helm/values/consul.yaml
 create mode 100644 tests/k8s/kube-helm/values/redis.yaml

diff --git a/.github/workflows/extended-tests.yml b/.github/workflows/tests.yml
similarity index 64%
rename from .github/workflows/extended-tests.yml
rename to .github/workflows/tests.yml
index 10fdb4e8..b2650eec 100644
--- a/.github/workflows/extended-tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,13 +2,14 @@ name: k8s
 on:
   push:
     branches:
-      - cdev-ignore
-
+      - "*"
+  pull_request:
+    branches:
+      - master
 jobs:
   tests:
     name: Check dnd
     runs-on: ubuntu-latest
-    # container: golang:1.21.3-alpine
     steps:
 
     - name: Install soft
@@ -27,11 +28,7 @@ jobs:
         fetch-depth: 2
 
     - uses: rinx/setup-k3d@v0.0.2
-      name: install k3d
-
-    - name: Get cluster info
-      run: |
-        kubectl cluster-info
+      name: Deploy k3d cluster
 
     - name: Build cdev
       run: |
@@ -40,5 +37,12 @@ jobs:
         id=$(docker create tmp-cdev:latest)
         docker cp $id:/bin/cdev /usr/local/bin/
         docker rm -v $id
-        cdev -v
-        kubectl get node
+
+    - name: Run AWS deploy/destroy and 'cdev deep graph' tests
+      run: cd tests/test-project/ && cdev apply --force -l debug && cdev destroy --force -l debug
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Run kubernetes/k8s-manifest/helm tests
+      run: cd tests/tests/k8s/ && cdev apply --force -l debug && cdev destroy --force -l debug
diff --git a/tests/k8s/kube-helm/template.yaml b/tests/k8s/kube-helm/template.yaml
index 6c3479e8..05927795 100644
--- a/tests/k8s/kube-helm/template.yaml
+++ b/tests/k8s/kube-helm/template.yaml
@@ -7,18 +7,18 @@ kind: StackTemplate
 cliVersion: "~>0.9.2"
 units:
   -
-    name: consul
+    name: redis
     type: helm
     source:
       repository: "https://charts.bitnami.com/bitnami"
-      chart: "consul"
-      version: "10.9.12"
+      chart: "redis"
+      version: "19.5.5"
     provider_conf: {{ insertYAML .variables.k8s_conf }}
     additional_options:
       namespace: default
       create_namespace: true
     values:
-      - file: ./values/consul.yaml
+      - file: ./values/redis.yaml
         apply_template: true
   -
     name: cert-manager-issuer
diff --git a/tests/k8s/kube-helm/values/consul.yaml b/tests/k8s/kube-helm/values/consul.yaml
deleted file mode 100644
index 00184da2..00000000
--- a/tests/k8s/kube-helm/values/consul.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-replicaCount: 1
-fullnameOverride: {{ .variables.consul.name_override | default "consul" }}
diff --git a/tests/k8s/kube-helm/values/redis.yaml b/tests/k8s/kube-helm/values/redis.yaml
new file mode 100644
index 00000000..adf40ee8
--- /dev/null
+++ b/tests/k8s/kube-helm/values/redis.yaml
@@ -0,0 +1,6 @@
+
+architecture: standalone
+fullnameOverride: {{ .variables.consul.name_override | default "redis" }}
+auth:
+  enabled: false
+  sentinel: false
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
index 190afd26..0026e695 100644
--- a/tests/k8s/stack.yaml
+++ b/tests/k8s/stack.yaml
@@ -8,7 +8,7 @@ variables:
     config_path: "~/.kube/config"
     config_context: "k3d-test"
   consul:
-    name_override: renamed-consul
+    name_override: renamed-redis
   nginx:
     name_override: renamed-nginx
 

From 9f3e639395c332d3c6f1b5ee0fc8c92c29c3871a Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 13:51:19 +0300
Subject: [PATCH 30/40] fic error version check

---
 .github/workflows/tests.yml        | 2 +-
 internal/project/stack_template.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b2650eec..cf625930 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
       - master
 jobs:
   tests:
-    name: Check dnd
+    name: e2e testing
     runs-on: ubuntu-latest
     steps:
 
diff --git a/internal/project/stack_template.go b/internal/project/stack_template.go
index c56a7bb5..2a57f771 100644
--- a/internal/project/stack_template.go
+++ b/internal/project/stack_template.go
@@ -47,7 +47,7 @@ func NewStackTemplate(data []byte) (*stackTemplate, error) {
 		log.Debug("Checking client version...")
 		reqVerConstraints, err := semver.NewConstraint(iTmpl.ReqClientVersion)
 		if err != nil {
-			return nil, fmt.Errorf("parsing template: can't parse required client version: %v", iTmpl.ReqClientVersion)
+			return nil, fmt.Errorf("parsing template: can't parse required client version: %v, err: %v", iTmpl.ReqClientVersion, err)
 		}
 		ver, err := semver.NewVersion(config.Global.Version)
 		if err != nil {

From 86f5dcdcb64761bef5924facdf176ec8135b7eab Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 13:54:16 +0300
Subject: [PATCH 31/40] fix error test, fix test build

---
 .github/workflows/tests.yml        | 2 ++
 internal/project/stack_template.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cf625930..2ca8b883 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,6 +32,8 @@ jobs:
 
     - name: Build cdev
       run: |
+        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
+        git fetch --prune --unshallow --tags
         cp Dockerfile-alpine Dockerfile
         docker build -t tmp-cdev:latest .
         id=$(docker create tmp-cdev:latest)
diff --git a/internal/project/stack_template.go b/internal/project/stack_template.go
index 2a57f771..17cab915 100644
--- a/internal/project/stack_template.go
+++ b/internal/project/stack_template.go
@@ -52,7 +52,7 @@ func NewStackTemplate(data []byte) (*stackTemplate, error) {
 		ver, err := semver.NewVersion(config.Global.Version)
 		if err != nil {
 			// Invalid current cli version. Maybe test revision.
-			return nil, fmt.Errorf("parsing template: can't parse client version: %v", iTmpl.ReqClientVersion)
+			return nil, fmt.Errorf("parsing template: can't parse client version: %v", err)
 		}
 		ok, messages := reqVerConstraints.Validate(ver)
 		errReasons := ""

From 826ea462e29a43b48dc5dc71766d6cff68443028 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:00:26 +0300
Subject: [PATCH 32/40] fix tests

---
 .github/workflows/pr_tests.yml | 35 ----------------------------------
 .github/workflows/tests.yml    |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 .github/workflows/pr_tests.yml

diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml
deleted file mode 100644
index 324183ed..00000000
--- a/.github/workflows/pr_tests.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Pr Tests
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  tests:
-    name: Build and run tests
-    runs-on: ubuntu-latest
-    container: golang:1.21.3-alpine
-    steps:
-
-    - name: Install soft
-      run: |
-        apk add make bash jq curl git zip
-        wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip
-        unzip terraform_1.4.4_linux_amd64.zip
-        cp terraform /usr/local/bin/
-
-    - name: Code checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 2
-
-    - name: Build
-      run: |
-        git config --global --add safe.directory /__w/cluster.dev/cluster.dev
-        git fetch --prune --unshallow --tags && make && cp ./bin/linux-amd64/cdev /usr/local/bin/
-
-    - name: Run tests
-      run: cd tests/test-project/ && cdev apply --force -l debug && cdev destroy --force -l debug
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ca8b883..2f72c25a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,4 +47,4 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
     - name: Run kubernetes/k8s-manifest/helm tests
-      run: cd tests/tests/k8s/ && cdev apply --force -l debug && cdev destroy --force -l debug
+      run: cd tests/k8s/ && cdev apply --force -l debug && cdev destroy --force -l debug

From 60de373881e00eb0a87a6768205d93bbdc9be137 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:10:14 +0300
Subject: [PATCH 33/40] debug kubeconfig

---
 .github/workflows/tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2f72c25a..f1ca92d2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,6 +32,11 @@ jobs:
 
     - name: Build cdev
       run: |
+        kubectl get node
+        ls -la ~/
+        find ~/
+        exit 1
+        env
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
         cp Dockerfile-alpine Dockerfile

From 57305701133395d41f9956e175112862ea2c5b86 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:14:26 +0300
Subject: [PATCH 34/40] debug k3d

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f1ca92d2..4430ea1f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,10 +33,10 @@ jobs:
     - name: Build cdev
       run: |
         kubectl get node
-        ls -la ~/
-        find ~/
-        exit 1
+        ls -la ~/.kube/
+        cat .config
         env
+        exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
         cp Dockerfile-alpine Dockerfile

From 26243b3690cccb88879aabb0b26bba41091ac9d6 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:17:28 +0300
Subject: [PATCH 35/40] ser kubeconfig path

---
 .github/workflows/tests.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4430ea1f..e9412568 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
       - master
+env:
+  KUBECONFIG: "~/.kube/config"
+
 jobs:
   tests:
     name: e2e testing
@@ -34,7 +37,7 @@ jobs:
       run: |
         kubectl get node
         ls -la ~/.kube/
-        cat .config
+        cat ~/.kube/config
         env
         exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev

From b576762a4a3de9467ef7b74203b599ee7dc69b86 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:19:43 +0300
Subject: [PATCH 36/40] check k3d conf

---
 .github/workflows/tests.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9412568..59d8b959 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,8 +6,6 @@ on:
   pull_request:
     branches:
       - master
-env:
-  KUBECONFIG: "~/.kube/config"
 
 jobs:
   tests:
@@ -36,8 +34,7 @@ jobs:
     - name: Build cdev
       run: |
         kubectl get node
-        ls -la ~/.kube/
-        cat ~/.kube/config
+        ls -la ~/.k3d/
         env
         exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev

From b887c39b6a29bf3d09b799e05240158f3f671d0f Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:24:26 +0300
Subject: [PATCH 37/40] k3d conf check

---
 .github/workflows/tests.yml | 2 +-
 tests/k8s/stack.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 59d8b959..05a0f217 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Build cdev
       run: |
         kubectl get node
-        ls -la ~/.k3d/
+        ls -la /github/home/k3d/k3d.yaml
         env
         exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
index 0026e695..35ad58f4 100644
--- a/tests/k8s/stack.yaml
+++ b/tests/k8s/stack.yaml
@@ -5,7 +5,7 @@ disabled: false
 backend: default
 variables:
   k8s_conf:
-    config_path: "~/.kube/config"
+    config_path: "/github/home/k3d/k3d.yaml"
     config_context: "k3d-test"
   consul:
     name_override: renamed-redis

From 4fc08e76a7bdf91861417259e753cf9e6ac9cb10 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:27:05 +0300
Subject: [PATCH 38/40] fix

---
 .github/workflows/tests.yml | 3 +--
 tests/k8s/stack.yaml        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 05a0f217..f6eb5ad1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,8 +34,7 @@ jobs:
     - name: Build cdev
       run: |
         kubectl get node
-        ls -la /github/home/k3d/k3d.yaml
-        env
+        echo ${KUBECONFIG}
         exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
index 35ad58f4..fccfc8f2 100644
--- a/tests/k8s/stack.yaml
+++ b/tests/k8s/stack.yaml
@@ -5,7 +5,7 @@ disabled: false
 backend: default
 variables:
   k8s_conf:
-    config_path: "/github/home/k3d/k3d.yaml"
+    config_path: {{ reqEnv "KUBECONFIG" }}
     config_context: "k3d-test"
   consul:
     name_override: renamed-redis

From fb0fd26c7c413a72e2eacb82bdd295a1ab011305 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:29:34 +0300
Subject: [PATCH 39/40] final fix

---
 .github/workflows/tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f6eb5ad1..784fec08 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,9 +33,6 @@ jobs:
 
     - name: Build cdev
       run: |
-        kubectl get node
-        echo ${KUBECONFIG}
-        exit 1
         git config --global --add safe.directory /__w/cluster.dev/cluster.dev
         git fetch --prune --unshallow --tags
         cp Dockerfile-alpine Dockerfile

From 913b9e91202f85267b96e3a7bf6c0b7b19458ae0 Mon Sep 17 00:00:00 2001
From: romanprog <arti@shalb.com>
Date: Wed, 19 Jun 2024 14:36:15 +0300
Subject: [PATCH 40/40] final fix 2

---
 .github/workflows/tests.yml | 4 +++-
 tests/k8s/stack.yaml        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 784fec08..5eb12e9c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,4 +48,6 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
     - name: Run kubernetes/k8s-manifest/helm tests
-      run: cd tests/k8s/ && cdev apply --force -l debug && cdev destroy --force -l debug
+      run: |
+        export KUBE_CONTEXT=$(kubectl config current-context)
+        cd tests/k8s/ && cdev apply --force -l debug && cdev destroy --force -l debug
diff --git a/tests/k8s/stack.yaml b/tests/k8s/stack.yaml
index fccfc8f2..a47c1cfb 100644
--- a/tests/k8s/stack.yaml
+++ b/tests/k8s/stack.yaml
@@ -6,7 +6,7 @@ backend: default
 variables:
   k8s_conf:
     config_path: {{ reqEnv "KUBECONFIG" }}
-    config_context: "k3d-test"
+    config_context: {{ reqEnv "KUBE_CONTEXT" }}
   consul:
     name_override: renamed-redis
   nginx: