Merge pull request #43 from darkstarmv/templates

update helm and helmdiff versions

Author: darkstarmv

Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.15-alpine as builder
-ENV DESIRED_VERSION=v3.8.0
-ENV HELM_DIFF_VERSION=v3.4.0
+ENV DESIRED_VERSION=v3.9.0
+ENV HELM_DIFF_VERSION=v3.5.0
 WORKDIR /go/src/github.com/target/impeller
 COPY . .
 ENV GO111MODULE=on
@@ -21,7 +21,7 @@ RUN cd /tmp && \
 RUN /usr/local/bin/helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 
 FROM alpine:latest
-ENV KUBECTL_VERSION=v1.23.4
+ENV KUBECTL_VERSION=v1.23.9
 RUN apk add ca-certificates
 RUN wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
     chmod +x /usr/bin/kubectl

README.md

@@ -26,11 +26,22 @@ Manages Helm charts running in Kubernetes clusters.
 ## How to use
 ### Command line
 1. Deployment command:
-`impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context`
+
+```bash
+impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context
+```
+
+or using `base64` encoded `kubeconfig`:
+
+```bash
+impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(base64 ~/.kube/config)" --kube-context my-kubernetes-context --kube-config-base64=true
+```
 2. Dry run command:
-`impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context --dry-run`
+```bash
+ impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context --dry-run
+ ```
 By default override values are hidden with `--dry-run` option. You can add `showValue: true` to your release to enable printout:
-```
+```bash
 releases:
   - name: test-release
     namespace: kube-system
@@ -41,11 +52,17 @@ releases:
         value: 1.6.0
 ```
 3. Diff run command:
-`impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context --diff-run`
+```bash
+impeller --cluster-config-path=./clusters/my-cluster.yaml --kube-config="$(cat ~/.kube/config)" --kube-context my-kubernetes-context --diff-run
+```
 4. Generate Audit report file:
-`impeller --cluster-config-path=./clusters  --audit=true`
+```bash
+impeller --cluster-config-path=./clusters  --audit=true
+```
 or
-`impeller --cluster-config-path=./clusters  --audit=true --audit-file=./myreport.csv`
+```bash
+impeller --cluster-config-path=./clusters  --audit=true --audit-file=./myreport.csv
+```
 
 ### Drone pipeline
 #### Simple example

main.go

@@ -32,6 +32,11 @@ func main() {
 			Usage:  "Kubernetes configuration file",
 			EnvVar: "KUBE_CONFIG,PLUGIN_KUBE_CONFIG,PARAMETER_KUBE_CONFIG",
 		},
+		cli.BoolFlag{
+			Name:   "kube-config-base64",
+			Usage:  "Flag true/false, base64 encoded kubeconfig",
+			EnvVar: "KUBE_CONFIG_BASE64,PLUGIN_KUBE_CONFIG_BASE64,PARAMETER_KUBE_CONFIG_BASE64",
+		},
 		cli.StringFlag{
 			Name:   "kube-context",
 			Usage:  "Kubernetes configuration context to use",
@@ -105,6 +110,7 @@ func run(ctx *cli.Context) error {
 		ClustersList:      clist,
 		ValueFiles:        ctx.StringSlice("value-files"),
 		KubeConfig:        ctx.String("kube-config"),
+		KubeConfigBase64:  ctx.Bool("kube-config-base64"),
 		KubeContext:       ctx.String("kube-context"),
 		Dryrun:            ctx.Bool("dry-run"),
 		Diffrun:           ctx.Bool("diff-run"),

plugin.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/base64"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -30,6 +31,8 @@ type Plugin struct {
 	ClustersList      report.Clusters
 	ValueFiles        []string
 	KubeConfig        string
+	KubeConfigFile    string
+	KubeConfigBase64  bool
 	KubeContext       string
 	Dryrun            bool
 	Diffrun           bool
@@ -336,22 +339,45 @@ func (p *Plugin) templateChart(release *types.Release) (string, error) {
 }
 
 func (p *Plugin) setupKubeconfig() error {
-	// Providing a Kubernetes config is mostly used for Drone support.
-	// If not provided, the default `kubectl` search path is used.
-	// WARNING: this may overwrite your config if it already exists.
+	var err error
+	byteData := []byte{}
+
 	if p.KubeConfig != "" {
-		log.Println("Creating Kubernetes config")
-		if err := ioutil.WriteFile(kubeConfig, []byte(p.KubeConfig), 0600); err != nil {
+		p.KubeConfigFile = kubeConfig + "-" + p.KubeContext
+		log.Println("Creating Kubernetes configfile" + p.KubeConfigFile)
+		if p.KubeConfigBase64 {
+			log.Println("configfile is base64 encoded")
+			byteData, err = base64.StdEncoding.DecodeString(p.KubeConfig)
+			if err != nil {
+				log.Fatalf("err %v", err)
+			}
+
+		} else {
+			log.Println("configfile is not encoded")
+			byteData = []byte(p.KubeConfig)
+		}
+
+		if err := ioutil.WriteFile(p.KubeConfigFile, byteData, 0600); err != nil {
 			return fmt.Errorf("error creating kube config file: %v", err)
 		}
+		log.Println("setting KUBECONFIG environment variable to:  " + p.KubeConfigFile)
+		err := os.Setenv("KUBECONFIG", p.KubeConfigFile)
+		if err != nil {
+			log.Fatalf("err %v", err)
+		}
 	}
 
 	// Providing a Kubernetes config context is mostly used for Drone support.
 	// If not provided, the current context from Kubernetes config is used.
 	if p.KubeContext != "" {
 		log.Println("Setting Kubernetes context")
-		cmd := exec.Command(kubectlBin, "config", "use-context", p.KubeContext)
-		if err := utils.Run(cmd, true); err != nil {
+		cb := commandbuilder.CommandBuilder{Name: kubectlBin}
+		cb.Add(commandbuilder.Arg{Type: commandbuilder.ArgTypeRaw, Value: "config"})
+		cb.Add(commandbuilder.Arg{Type: commandbuilder.ArgTypeRaw, Value: "use-context"})
+		cb.Add(commandbuilder.Arg{Type: commandbuilder.ArgTypeRaw, Value: p.KubeContext})
+		cb.Add(commandbuilder.Arg{Type: commandbuilder.ArgTypeLongParam, Name: "kubeconfig", Value: p.KubeConfigFile})
+		cmd := cb.Command()
+		if err := utils.Run(cmd, false); err != nil {
 			return fmt.Errorf("error setting Kubernetes context: %v", err)
 		}
 	}