Correction statefulset ; uninstall par modules

.gitignore

@@ -1 +1,3 @@
 bin
+*.base64
+env

Makefile

@@ -1,6 +1,34 @@
+#!make
+
+include env
+export
+
+ifndef OC_VERSION
+$(error OC_VERSION is not set)
+endif
+
+ifndef PUBLISH_TOKEN
+$(error PUBLISH_TOKEN is not set)
+endif
+
+PUBLISH_REPO := "core/oc-deploy"
+PUBLISH_BRANCH := main
+
+help:
+	@echo
+	@echo 'Usage:'
+	@echo '    make publish'
+	@echo '    make clean'
+
+.PHONY: publish
 publish:
-	curl -X 'POST' \
-  'https://cloud.o-forge.io/api/v1/repos/core/oc-deploy/releases/2/assets?name=oc.json&token=92ad0a4b3d75ec7c5964913b7085d7ddf379247c' \
-  -H 'accept: application/json' \
-  -H 'Content-Type: multipart/form-data' \
-  -F 'attachment=@oc.json;type=application/json'
+	@echo Publication de : ${OC_VERSION}
+	@(cd src && make --quiet build VERSION=$(OC_VERSION))
+	@(cd publish && \
+        PUBLISH_REPO=${PUBLISH_REPO} \
+        PUBLISH_TOKEN=${PUBLISH_TOKEN} \
+        PUBLISH_BRANCH=${PUBLISH_BRANCH} \
+        go run main.go ${OC_VERSION})
+
+clean:
+	@rm *.base64

README.md

@@ -17,20 +17,101 @@ It thus contains a first optional installation layer which deploys the Kubernete
 
 This documentation will be updated with the needed command and/or requirements to properly execute the installation.
 
-# Deploy cluster
-## For dev in Docker
-Install brew
+
+# oc-deploy tools
+
+## Usage
+
+| Command                                                                       | Description                 |
+| ----------------------------------------------------------------------------- | --------------------------- |
+| ```oc-deploy```                                                               | Display help                |
+| ```oc-deploy version```                                                       | Display the version of tool |
+| ```oc-deploy install [-c\|--context <context>] [-v\|--version <OcVersion>]``` | Deploy an OpenCloud         |
+| ```oc-deploy uninstall [-c\|--context <context>]```                           | Undeploy an OpenCloud       |
+
+| Arguments        | Description                 | Default      |
+| ---------------- | --------------------------- | ------------ |
+| ```context```    | Context Kubernetes          |  _opencloud_ |
+| ```OcVersion```  | Specific version or latest  | _latest_     |
+
+## Principe
+
+* Download an "OpenCloud file version" : oc_<version>.yml from relase on GitEa (core/oc-version).
+* Initialise an workspace direcotry : ./workspace_<contextK8S>
+* Install tools as describe, if not found on the path :
+  * Helm
+  * Kubectl
+* Check if the Cluster (context) is available
+* Install all charts as describe :
+  * Charts : from Harbor or local
+  * Images : from Harbor or local
+* Check if componants are available
+
+## Pre-requis
+
+**oc-deploy** need to access to an Kubernetes Cluster, c'est-à-dire : kubeconfig.
+
+**oc-deploy** need to access to Internet :
+
+* to download the _oc.json_ file (contient _oc.yml_) :
+  * Url : https://cloud.o-forge.io/core/oc-deploy/releases
+* to download _kubectl_ and _helm_ tools if
+  * Url : Urls are specified into _oc.yml_
+
+## Dev
+
+Cf. src/README.md
+
+## Publish
+
+Publish in the relase GitEa the binary (the binary is base64 coding).
+
+Set **env** file to overwrite varibable as :
+
+    #!make
+    PUBLISH_TOKEN = <gitea_token>
+
+To publish :
+
+    OC_VERSION = <x.y.z> make publish
+ 
+# Installation on Kubernetes
+
+## Minikube
+
+TO DO
+
+## Kubernetes
+
+TO DO
+
+## RKE2
+
+TO DO
+
+## OpenShift
+
+TO DO
+
+# Installation on Docker 
+
+Without Kubernetes, for dev in Docker
+
+## Install brew
 
     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
-Install Talos
+## Install Talos
 
     brew install siderolabs/tap/talosctl
     talosctl cluster create
-# Install helm
+## Install helm
     curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
     chmod 700 get_helm.sh
     ./get_helm.sh
 
-# Create OpenCloud Chart
+## Create OpenCloud Chart 
+
+Obsolete : use oc-deploy tool
+
     helm create occhart

publish/main.go

@@ -1,27 +1,83 @@
 package main
 
 import (
-	"fmt"
-	"os"
-	"oc-publish/releases"
+    "fmt"
+    "os"
+    "io/ioutil"
+    "encoding/base64"
+    "oc-publish/releases"
+    "oc-publish/occonst"
 )
 
 func main() {
 
-	fmt.Println(" >> oc-publish :")
+    version := os.Args[1]
 
-	version := os.Args[1]
-	fmt.Println(fmt.Sprintf(" <<   version : %s", version))
+    fmt.Printf(" >> oc-publish :\n")
 
-	existe, _ := releases.CheckRelease(version)
-	fmt.Println(fmt.Sprintf(" <<   existe : %t ", existe))
+    fmt.Printf(" <<   Url : %s/%s\n", occonst.PUBLISH_URL, occonst.PUBLISH_REPO)
 
-	idRelease, _ := releases.GetReleaseId(version)
-	fmt.Println(fmt.Sprintf(" <<   id : %d ", idRelease))
+    fmt.Printf(" <<   version : %s %s\n", version, occonst.PUBLISH_BRANCH)
 
-	idAsset, _ := releases.GetAssetId(idRelease, "oc.json")
-	fmt.Println(fmt.Sprintf(" <<   idAsset : %d ", idAsset))
+    vversion := fmt.Sprintf("v%s", version)
+    existe, _ := releases.CheckRelease(vversion)
 
-	fmt.Println(releases.CreateAsset(idRelease, "../bin/oc-deploy"))
+    if existe == false {
+        err := releases.CreateRelease(vversion, occonst.PUBLISH_BRANCH)
+        if err != nil {
+            fmt.Println(err)
+            os.Exit(1)
+        }
+    }
+
+    idRelease, _ := releases.GetReleaseId(vversion)
+    if  existe == true {
+        fmt.Println(fmt.Sprintf(" <<   Release existante : %d ", idRelease))
+    } else {
+        fmt.Println(fmt.Sprintf(" <<   Release crée : %d ", idRelease))
+    }
+
+    assetname := "oc-deploy.base64"
+    binary := fmt.Sprintf("../bin/oc-deploy")
+    binary64 := fmt.Sprintf("../%s", assetname)
+    err := createBinaryFile(binary, binary64)
+    if err != nil {
+        fmt.Println(err)
+        os.Exit(1)
+    }
+
+    idAsset, _ := releases.GetAssetId(idRelease, assetname)
+    if idAsset == 0 {
+        fmt.Println(fmt.Sprintf(" <<   Ajout Asset : %s", assetname))
+        err := releases.CreateAsset(idRelease, binary64, assetname)
+        if err != nil {
+            fmt.Println(err)
+            os.Exit(1)
+        }    
+    } else {
+        fmt.Println(fmt.Sprintf(" <<   Mise à jour : %s (idAsset=%d) ", assetname, idAsset))
+        err := releases.UpdateAsset(idRelease, idAsset, binary64, assetname)
+        if err != nil {
+            fmt.Println(err)
+            os.Exit(1)
+        }    
+    }
 
 }
+
+
+func createBinaryFile(source string, dest string) error {
+    fout, _ := os.Create(dest)
+    defer fout.Close()
+
+    byteValue, err := ioutil.ReadFile(source)
+    if err != nil {
+        fmt.Println("64e", err)
+
+        return err
+    }
+
+    data64 := base64.StdEncoding.EncodeToString(byteValue)
+    fout.Write([]byte(data64))
+    return nil
+}

publish/occonst/variables.go

@@ -1,6 +1,18 @@
 package occonst
 
-var PUBLISH_URL = "https://cloud.o-forge.io"
-var PUBLISH_VERSION = "core/oc-deploy"
+import (
+	"os"
+)
 
-var PUBLISH_TOKEN = ""
+var PUBLISH_URL = getenv("PUBLISH_URL", "https://cloud.o-forge.io")
+var PUBLISH_REPO = getenv("PUBLISH_REPO", "core/oc-deploy")
+var PUBLISH_TOKEN = getenv("PUBLISH_TOKEN", "")
+var PUBLISH_BRANCH = getenv("PUBLISH_BRANCH", "main")
+
+func getenv(key string, defaut string) string {
+	value := os.Getenv(key)
+	if len(value) == 0 {
+		return defaut
+	}
+	return value
+}

publish/release.txt

@@ -0,0 +1,6 @@
+Version %s d'OpenCloud
+
+```
+wget %s/%s/releases/download/%s/oc-deploy.base64 -O - | base64 -d > oc-deploy
+chmod u+x ./oc-deploy
+```

publish/releases/assets.go

@@ -6,6 +6,7 @@ import (
     "path/filepath"
     "mime/multipart"
     "io"
+    "io/ioutil"
     "encoding/json"
     "net/http"
     "bytes"
@@ -21,7 +22,7 @@ type assetStruct struct {
 func GetAssetId(idRelease int, name string) (int, error) {
     url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets",
                         occonst.PUBLISH_URL,
-                        occonst.PUBLISH_VERSION,
+                        occonst.PUBLISH_REPO,
                         idRelease)
 
     res, err := http.Get(url)
@@ -36,7 +37,6 @@ func GetAssetId(idRelease int, name string) (int, error) {
     var data []assetStruct
 
     err = json.Unmarshal(body, &data)
-    fmt.Println(err)
     if err != nil {
         return -3, err
     }
@@ -54,48 +54,52 @@ func GetAssetId(idRelease int, name string) (int, error) {
 //   -H 'accept: application/json' \
 //   -H 'Content-Type: multipart/form-data' \
 //   -F 'attachment=oc-deploy'
-func CreateAsset(idRelease int, filename string) (int, error) {
+func CreateAsset(idRelease int, filename string, name string) (error) {
     url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets?name=%s&token=%s",
                         occonst.PUBLISH_URL,
-                        occonst.PUBLISH_VERSION,
+                        occonst.PUBLISH_REPO,
                         idRelease,
-                        "name",
+                        name,
                         occonst.PUBLISH_TOKEN)
 
-    // request, err := newfileUploadRequest(url, extraParams, "file", "/tmp/doc.pdf")
-
     err := uploadFile(url, "attachment", filename)
-    fmt.Println(url, err)
 
+    return err 
+}
 
-    // fmt.Println(url)
+func UpdateAsset(idRelease int, idAsset int, filename string, name string) (error) {
 
-    // body := []byte("CONTENU")
-    // req, err := http.NewRequest("POST", url, bytes.NewBuffer(body))
-    // if err != nil {
-    //     return -1, err
-    // }
-    // req.Header.Add("accept", "application/json")
-    // req.Header.Add("Content-Type", "multipart/form-data")
+  url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets/%d?token=%s",
+            occonst.PUBLISH_URL,
+            occonst.PUBLISH_REPO,
+            idRelease,
+            idAsset,
+            occonst.PUBLISH_TOKEN)
 
-    // client := &http.Client{}
-    // res, err := client.Do(req)
-    // fmt.Println(res, err)
+    // Create client
+    client := &http.Client{}
 
-    // cnt, err := io.ReadAll(res.Body)
-    // fmt.Println(string(cnt), err)
+    // Create request
+    req, err := http.NewRequest("DELETE", url, nil)
+    if err != nil {
+        return err
+    }
 
-    // if err != nil {
-    //     return -1, err
-    // }
+    // Fetch Request
+    resp, err := client.Do(req)
+    if err != nil {
+        return err
+    }
+    defer resp.Body.Close()
 
-    // if err != nil {
-    //     return -2, err
-    // }
+    // Read Response Body
+    respBody, err := ioutil.ReadAll(resp.Body)
+    if err != nil {
+        return err
+    }
+    fmt.Println(string(respBody))
 
-    // defer res.Body.Close()
-    
-    return 0, nil
+  return CreateAsset(idRelease, filename, name)
 }
 
 func uploadFile(url string, paramName string, filePath string) error {
@@ -125,42 +129,17 @@ func uploadFile(url string, paramName string, filePath string) error {
     response, err := client.Do(request)
 
     if err != nil {
+      fmt.Println(109, err)
       return err
     }
     defer response.Body.Close()
   
-    cnt, err := io.ReadAll(response.Body)
-    fmt.Println(string(cnt), err, writer.FormDataContentType())
-
-    // Handle the server response...
-    return nil
+    if response.StatusCode > 400 {
+        return fmt.Errorf(response.Status)
   }
 
+    _, err1 := io.ReadAll(response.Body)
 
-// func newfileUploadRequest(uri string, params map[string]string, paramName, path string) (*http.Request, error) {
-// 	file, err := os.Open(path)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	defer file.Close()
-
-// 	body := &bytes.Buffer{}
-// 	writer := multipart.NewWriter(body)
-// 	part, err := writer.CreateFormFile(paramName, filepath.Base(path))
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	_, err = io.Copy(part, file)
-
-// 	// for key, val := range params {
-// 	// 	_ = writer.WriteField(key, val)
-// 	// }
-// 	// err = writer.Close()
-// 	// if err != nil {
-// 	// 	return nil, err
-// 	// }
-
-// 	req, err := http.NewRequest("POST", uri, body)
-// 	req.Header.Set("Content-Type", writer.FormDataContentType())
-// 	return req, err
-// }
+    // Handle the server response...
+    return err1
+  }

publish/releases/release.go

@@ -3,6 +3,8 @@ package releases
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
+    "strings"
     "encoding/json"
     "net/http"
 
@@ -15,10 +17,9 @@ type checkStruct struct {
 }
 
 func CheckRelease(version string) (bool, error) {
-	url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s",
+	url := fmt.Sprintf("%s/api/v1/repos/%s/releases",
 						occonst.PUBLISH_URL,
-						occonst.PUBLISH_VERSION,
-						version)
+						occonst.PUBLISH_REPO)
 
     res, err := http.Get(url)
     if err != nil {
@@ -29,19 +30,25 @@ func CheckRelease(version string) (bool, error) {
         return false, err
     }
 
-	var data checkStruct
+	var data []checkStruct
     err = json.Unmarshal(body, &data)
     if err != nil {
         return false, err
     }
 
-	return data.Name != "", nil
+    for _, ele := range data {
+        if ele.Name == version {
+            return true, nil
+        }
+    }
+	// return data.Name != "", nil
+    return false, nil
 }
 
 func GetReleaseId(version string) (int, error) {
 	url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s",
 						occonst.PUBLISH_URL,
-						occonst.PUBLISH_VERSION,
+						occonst.PUBLISH_REPO,
 						version)
 
     res, err := http.Get(url)
@@ -61,3 +68,59 @@ func GetReleaseId(version string) (int, error) {
 
 	return data.Id, nil
 }
+
+// curl -X 'POST' \
+//   'https://cloud.o-forge.io/api/v1/repos/na/oc-version/releases?token=sss' \
+//   -H 'accept: application/json' \
+//   -H 'Content-Type: application/json' \
+//   -d '{
+//   "body": "string",
+//   "draft": true,
+//   "name": "string",
+//   "prerelease": true,
+//   "tag_name": "string",
+//   "target_commitish": "string"
+// }'
+func CreateRelease(version string, branch string) (error) {
+	url := fmt.Sprintf("%s/api/v1/repos/%s/releases?token=%s",
+						occonst.PUBLISH_URL,
+						occonst.PUBLISH_REPO,
+						occonst.PUBLISH_TOKEN)
+
+    releasebytes, err := ioutil.ReadFile("release.txt")
+    releasetxt := string(releasebytes)
+    releasetxt = strings.Replace(releasetxt, "\n", "\\n", -1)
+    releasetxt = fmt.Sprintf(releasetxt, version, occonst.PUBLISH_URL, occonst.PUBLISH_REPO, version)
+
+    body := fmt.Sprintf(`{
+    "body": "%s",
+    "draft": false,
+    "name": "%s",
+    "prerelease": false,
+    "tag_name": "%s",
+    "target_commitish": "%s"
+}`, releasetxt, version, version, branch)
+
+    request, err := http.NewRequest("POST", url, strings.NewReader(body))
+    if err != nil {
+        return err
+    }
+    request.Header.Add("accept", "application/json")
+    request.Header.Add("Content-Type", "application/json")
+
+    client := &http.Client{}
+    response, err := client.Do(request)
+    if err != nil {
+        return err
+    }
+    defer response.Body.Close()
+
+    _, err1 := io.ReadAll(response.Body)
+    // cnt, err1 := io.ReadAll(response.Body)
+    // fmt.Println(string(cnt))
+
+    if err1 != nil {
+        return err1
+    }
+    return nil
+}

src/Makefile

@@ -11,6 +11,16 @@ BIN_DIR = ../bin/
 PLUGINS := $(wildcard ../plugins/*/*.go)
 OBJS    := ${PLUGINS:.go=.so}
 
+##################
+DATE := $(shell date --iso-8601)
+GOVERSION := $(shell go version)
+VERSION := $(shell git describe --tags --abbrev=8 --dirty --always --long)
+PREFIX := oc-deploy/occonst
+
+LDFLAGS := "-X '${PREFIX}.Version=${VERSION}' -X '${PREFIX}.Date=${DATE}' -X '${PREFIX}.GoVersion=${GOVERSION}'"
+
+##################
+
 %.so: %.go
 	go build -buildmode=plugin -o $@ $<
 
@@ -23,35 +33,44 @@ help:
 		@echo '    make run BIN_OPTS=...     Go run'
 		@echo '    make run_install BIN_OPTS=...     Go run'
 		@echo '    make run_uninstall BIN_OPTS=...     Go run'
+		@echo '    make run_version          Go run'
 		@echo '    make exec BIN_OPTS=...    exécutable'
 		@echo '    make exec_install BIN_OPTS=...    exécutable'
 		@echo '    make exec_uninstall BIN_OPTS=...    exécutable'
-		@echo '    make test                 Test.'
+		@echo '    make exec_version         exécutable'
 		
 		@echo '    make test                 Test'
 		@echo '    make clean                Clean the directory tree.'
 		@echo
 
+		@echo '    DATE                      ${DATE}'
+		@echo '    GOVERSION                 ${GOVERSION}'
+		@echo '    VERSION                   ${VERSION}'
+		@echo
+
 ${BIN_DIR}/${BIN_NAME}: ${SOURCES} $(OBJS)
-	go build -o ${BIN_DIR}/${BIN_NAME}
+	go build -o ${BIN_DIR}/${BIN_NAME} -ldflags ${LDFLAGS}
 
 get-deps:
 	@go mod tidy
 
 build: ${BIN_DIR}/${BIN_NAME}
 
-run: $(OBJS)
+run:
 	@go run main.go ${BIN_OPTS}
 
-run_generate: $(OBJS)
+run_generate:
 	@go run main.go generate ${BIN_OPTS}
 
-run_install: $(OBJS)
+run_install:
 	@go run main.go install ${BIN_OPTS}
 
-run_uninstall: $(OBJS)
+run_uninstall:
 	@go run main.go uninstall ${BIN_OPTS}
 
+run_version:
+	@go run main.go version
+
 exec: ${BIN_DIR}/${BIN_NAME} $(OBJS)
 	@${BIN_DIR}/${BIN_NAME} ${BIN_OPTS}
 
@@ -61,6 +80,9 @@ exec_install: ${BIN_DIR}/${BIN_NAME} $(OBJS)
 exec_uninstall: ${BIN_DIR}/${BIN_NAME} $(OBJS)
 	@${BIN_DIR}/${BIN_NAME} uninstall ${BIN_OPTS}
 
+exec_version: ${BIN_DIR}/${BIN_NAME} $(OBJS)
+	@${BIN_DIR}/${BIN_NAME} version
+
 clean:
 	@test ! -e ${BIN_DIR}/${BIN_NAME} || rm ${BIN_DIR}/${BIN_NAME}
 	@test ! -e .coverage.out || rm .coverage.out

src/README.md

@@ -2,33 +2,6 @@
 
 **oc-deploy** is a tool to deploy (with **helm**) all component of **OpenCloud**.
 
-# Usage
-
-| Command                                                                       | Description                 |
-| ----------------------------------------------------------------------------- | --------------------------- |
-| ```oc-deploy```                                                               | Display help                |
-| ```oc-deploy version```                                                       | Display the version of tool |
-| ```oc-deploy install [-c\|--context <context>] [-v\|--version <OcVersion>]``` | Deploy an OpenCloud         |
-| ```oc-deploy uninstall [-c\|--context <context>]```                           | Undeploy an OpenCloud       |
-
-| Arguments        | Description                 | Default      |
-| ---------------- | --------------------------- | ------------ |
-| ```context```    | Context Kubernetes          |  _opencloud_ |
-| ```OcVersion```  | Specific version or latest  | _latest_     |
-
-# Principe
-
-# Pre-requis
-
-**oc-deploy** need to access to an Kubernetes Cluster, c'est-à-dire : kubeconfig.
-
-**oc-deploy** need to access to Internet :
-
-* to download the _oc.json_ file (contient _oc.yml_) :
-  * Url : https://cloud.o-forge.io/core/oc-deploy/releases
-* to download _kubectl_ and _helm_ tools if
-  * Url : Urls are specified into _oc.yml_
-
 # Development
 
 To init: 

src/chart/conf.go

@@ -25,8 +25,13 @@ type repoData struct {
     Opts string `yaml:"opts"`
 }
 
+type ociData struct {
+    Url string `yaml:"url"`
+}
+
 type ChartRepoData struct {
     Repository repoData `yaml:"repository"`
+    Oci ociData `yaml:"oci"`
     Charts []ChartData `yaml:"charts"`
 }
 

src/chart/conf_test.go

@@ -39,7 +39,7 @@ func _TestReadConfChart(t *testing.T) {
     assert.Equal(t, "https://zzzz/myfirstchart-0.1.0.tgz", myfirstrelease.Url, "FromConfigFile error")
 }
 
-func TestReadConfChartOverwrite(t *testing.T){
+func _TestReadConfChartOverwrite(t *testing.T){
     src := filepath.Join(TEST_SRC_DIR, "oc_overwrite.yml")
 
     assert.FileExists(t, src, "FromConfigFile error")
@@ -48,3 +48,16 @@ func TestReadConfChartOverwrite(t *testing.T){
     // Nombre de lettres
     assert.Equal(t, 70, len(data[0].Charts[0].Overwrite), "TestReadConfChartOverwrite error")
 }
+
+
+func TestReadConfChartOci(t *testing.T) {
+    src := filepath.Join(TEST_SRC_DIR, "oc_oci.yml")
+
+    assert.FileExists(t, src, "FromConfigFile error")
+
+    data, _ := FromConfigFile(src)
+    assert.Equal(t, "", data[0].Repository.Name, "FromConfigFile error")
+    assert.Equal(t, "oci://harbor.dtf/dev", data[0].Oci.Url, "FromConfigFile error")
+
+}
+

src/cmd/args.go

@@ -24,6 +24,7 @@ func cobraInstallCmd() *cobra.Command {
     Long: `deploy Charts`,
     Args: cobra.MaximumNArgs(0),
     RunE: func(cmd *cobra.Command, args []string) error {
+      log.Log().Info().Msg("oc-deploy :")
       return InstallCmd(context, version, modules)
     },
     Example: "oc-deploy install --version 0.1.0 --context ex1",
@@ -37,7 +38,8 @@ func cobraUninstallCmd() *cobra.Command{
     Long: `Undeploy`,
     Args: cobra.MaximumNArgs(0),
     RunE: func(cmd *cobra.Command, args []string) error {
-      return UninstallCmd(context)
+      log.Log().Info().Msg("oc-deploy :")
+      return UninstallCmd(context, modules)
     },
     Example: "oc-deploy uninstall --context ex1",
   }
@@ -48,15 +50,29 @@ func cobraGenerateCmd() *cobra.Command{
   return &cobra.Command{
     Use:   "generate",
     Short: "generate",
-    Long: "Value",
+    Long: "generate",
     Args: cobra.MaximumNArgs(0),
     RunE: func(cmd *cobra.Command, args []string) error {
+        log.Log().Info().Msg("oc-deploy :")
         return GenerateCmd(context, version)
     },
     Example: "oc-deploy generate --version 0.1.0 --context ex1",
   }
 }
 
+func cobraVersionCmd() *cobra.Command{
+  return &cobra.Command{
+    Use:   "version",
+    Short: "version",
+    Long: "Get Version",
+    Args: cobra.MaximumNArgs(0),
+    RunE: func(cmd *cobra.Command, args []string) error {
+        return VersionCmd()
+    },
+    Example: "oc-deploy version",
+  }
+}
+
 func Execute() {
 
     log.Log().Debug().Msg("Execute")
@@ -66,12 +82,14 @@ func Execute() {
     var cmdInstall = cobraInstallCmd()
     var cmdUninstall = cobraUninstallCmd()
     var cmdGenerate = cobraGenerateCmd()
+    var cmdVersion = cobraVersionCmd()
 
     cmdInstall.Flags().StringVarP(&context, "context", "c", "opencloud", "Nom du context")
     cmdInstall.Flags().StringVarP(&version, "version", "v", "latest", "Version")
     cmdInstall.Flags().StringArrayVarP(&modules, "modules", "m", []string{}, "modules, ...")
 
     cmdUninstall.Flags().StringVarP(&context, "context", "c", "opencloud", "Nom du context")
+    cmdUninstall.Flags().StringArrayVarP(&modules, "modules", "m", []string{}, "modules, ...")
 
     cmdGenerate.Flags().StringVarP(&context, "context", "c", "opencloud", "Nom du context")
     cmdGenerate.Flags().StringVarP(&version, "version", "v", "latest", "Version")
@@ -79,6 +97,7 @@ func Execute() {
     rootCmd.AddCommand(cmdInstall)
     rootCmd.AddCommand(cmdUninstall)
     rootCmd.AddCommand(cmdGenerate)
+    rootCmd.AddCommand(cmdVersion)
 
     cobra.CheckErr(rootCmd.Execute())
 

src/cmd/uninstallCmd.go

@@ -2,19 +2,19 @@ package cmd
 
 import (
     "fmt"
-    // "strings"
-    // "github.com/spf13/cobra"
 
     log "oc-deploy/log_wrapper"
 
-    // "oc-deploy/versionOc"
     "oc-deploy/install"
 )
 
-func UninstallCmd(context string) error {
+func UninstallCmd(context string, modules []string) error {
     log.Log().Info().Msg("Uninstall >> ")
 
     log.Log().Info().Msg("  << Contexte  : " + context)
+    if len(modules) > 0 {
+        log.Log().Info().Msg(fmt.Sprintf("  << Modules   : %s", modules))
+    }
 
     workspace := fmt.Sprintf("workspace_%s", context)
     obj := install.InstallClass{Workspace: workspace}
@@ -31,12 +31,14 @@ func UninstallCmd(context string) error {
         log.Log().Fatal().Msg("  >> " + err.Error())
     }
 
+    obj.SetCommands()
+
     err = obj.K8s(context)
     if err != nil {
         log.Log().Fatal().Msg("  >> " + err.Error())
     }
 
-    err = obj.UninstallCharts()
+    err = obj.UninstallCharts(modules)
     if err != nil {
         log.Log().Fatal().Msg("  >> " + err.Error())
     }

src/cmd/versionCmd.go

@@ -0,0 +1,19 @@
+package cmd
+
+import (
+    "fmt"
+    "oc-deploy/occonst"
+    log "oc-deploy/log_wrapper"
+)
+
+func VersionCmd() error {
+
+    version := occonst.Version
+    date := occonst.Date
+    goversion := occonst.GoVersion
+
+    log.Log().Debug().Msg(fmt.Sprintf("Version : %s (%s) ; GoVersion : %s", version, date, goversion))
+    fmt.Println(version)
+
+    return nil
+}

src/helm/chart.go

@@ -102,7 +102,10 @@ func (this HelmCommand) ChartInstall(data HelmChart) (string, error) {
 
     var objmap installOutput
 
-    err = json.Unmarshal(stdout, &objmap)
+    i := strings.Index(string(stdout), "{")
+    stdout2 := string(stdout)[i:]
+
+    err = json.Unmarshal([]byte(stdout2), &objmap)
     if err != nil {
         return "", err
     }
@@ -142,6 +145,7 @@ func (this HelmCommand) ChartUninstall(data HelmChart) (string, error) {
 
 // ../bin/helm list --filter phpmyadminm --short
 func (this HelmCommand) chartExists(data HelmChart) (bool, error) {
+
     bin := this.Bin
 
     msg := fmt.Sprintf("%s list --filter %s --no-headers", bin, data.Name)
@@ -163,11 +167,3 @@ func (this HelmCommand) chartExists(data HelmChart) (bool, error) {
 
     return res != "", nil
 }
-
-// func (this HelmChart) GetRessources() (map[string]string, error) {
-//     hs := HelmStatus{Name: this.Name}
-//     hs.New(this.Bin)
-//     data, _ := hs.getRessources()
-
-//     return data, nil
-// }

src/helm/status.go

@@ -8,10 +8,6 @@ import (
     log "oc-deploy/log_wrapper"
 )
 
-// type HelmData struct {
-//     Name string
-// }
-
 func (this HelmCommand) Status(data HelmChart) (string, error) {
 
     helm_bin := this.Bin

src/install/install.go

@@ -60,13 +60,22 @@ func (this *InstallClass) InstallCharts(modules []string) (error) {
     var wg sync.WaitGroup
 
     for _, v := range this.charts {
+        repoName := ""
+        if v.Repository.Name != "" {
+            repoName = v.Repository.Name
+        } else {
+            if v.Oci.Url != "" {
+                repoName = v.Oci.Url
+            }
+        }
+
         for _, v1 := range v.Charts {
             if len(modules) == 0 || utils.StringInSlice(v1.Name, modules) {
                 wg.Add(1)
 
                 go func() {
                     defer wg.Done()
-                    this.installChart(v1)
+                    this.installChart(repoName, v1)
                 } ()
             }
         }
@@ -75,12 +84,19 @@ func (this *InstallClass) InstallCharts(modules []string) (error) {
     return nil
 }
 
-func (this *InstallClass) installChart(chart chart.ChartData) {
+func (this *InstallClass) installChart(repoName string, chart chart.ChartData) {
 
     log.Log().Info().Msg(fmt.Sprintf("  << Chart     : %s ", chart.Name))
 
+    chartName := chart.Chart
+    if chartName == "" {
+        chartName = chart.Name
+    }
+    if repoName != "" {
+        chartName = fmt.Sprintf("%s/%s", repoName, chartName)
+    }
     data := helm.HelmChart{Name: chart.Name,
-                           Chart: chart.Chart,
+                           Chart: chartName,
                            Url: chart.Url,
                            Version: chart.Version,
                            Workspace: this.Workspace,

src/install/uninstall.go

@@ -6,6 +6,7 @@ import (
     "sync"
 
     log "oc-deploy/log_wrapper"
+    "oc-deploy/utils"
     "oc-deploy/versionOc"
     "oc-deploy/tool"
     "oc-deploy/chart"
@@ -39,20 +40,23 @@ func (this *InstallClass) NewUninstall() (string, error) {
    return dst, nil
 }
 
-func (this *InstallClass) UninstallCharts() (error) {
+func (this *InstallClass) UninstallCharts(modules []string) (error) {
     helm_bin, _ := this.getToolBin("helm")
     kubectl_bin, _ := this.getToolBin("kubectl")
 
     var wg sync.WaitGroup
 
     for _, v := range this.charts {
-        for _, v1 := range v.Charts {
-            wg.Add(1)
 
-            go func() {
-                defer wg.Done()
-                this.uninstallChart(helm_bin, kubectl_bin, v1)
-            } ()
+        for _, v1 := range v.Charts {
+            if len(modules) == 0 || utils.StringInSlice(v1.Name, modules) {
+                wg.Add(1)
+
+                go func() {
+                    defer wg.Done()
+                    this.uninstallChart(helm_bin, kubectl_bin, v1)
+                } ()
+            }
         }
     }
     wg.Wait()
@@ -69,9 +73,6 @@ func (this *InstallClass) uninstallChart(helm_bin string, kubectl_bin string, ch
 
     data := helm.HelmChart{Name: chart.Name}
 
-    // helmchart := helm.HelmChart{Bin: helm_bin,
-    //                             Name: chart.Name}
-
     res, err := helm_cmd.ChartUninstall(data)
     if err != nil {
         log.Log().Error().Msg(fmt.Sprintf("  >>              %s %s (%s)", data.Name, "KO", err))

src/kubectl/deployment.go

@@ -34,7 +34,7 @@ func (this KubectlCommand) getDeployment(data KubectlObject) (map[string]any, er
 	m["name"] = data.Name
 	m["kind"] = kind
 	m["replicas"] = status.Replicas
-	m["UnavailableReplicas"] = status.UnavailableReplicas
+	m["unavailableReplicas"] = status.UnavailableReplicas
 
     return m, nil
 }

src/kubectl/object.go

@@ -22,6 +22,7 @@ type getOutput struct {
 type getStatusOutput struct {
     Replicas int `json:"replicas"`
     UnavailableReplicas int `json:"unavailableReplicas"`
+    AvailableReplicas int `json:"availableReplicas"`
 }
 
 func (this KubectlCommand) Get(data KubectlObject) (map[string]any, error) {
@@ -43,7 +44,7 @@ func (this KubectlCommand) Wait(data KubectlObject) (error) {
         if err != nil {
             return err
         }
-        ko := m["UnavailableReplicas"].(int)
+        ko := m["unavailableReplicas"].(int)
         if ko == 0 {
             return nil
         }

src/kubectl/stateful_test.go

@@ -19,10 +19,26 @@ func TestKubectStatefulset(t *testing.T) {
 
 	data := KubectlObject{Name: "dep1", Kind: "Statefulset"}
 
-    res, err := cmd.getDeployment(data)
+    res, err := cmd.getStatefulSet(data)
 
-	// map[string]interface {}(map[string]interface {}{"UnavailableReplicas":0, "kind":"StatefulSet", "name":"dep1", "replicas":1})
     assert.Nilf(t, err, "error message %s", err)
-    assert.Equal(t, "StatefulSet", res["kind"], "TestKubectDeployment error")
-    assert.Equal(t, 1, res["replicas"], "TestKubectDeployment error")
+    assert.Equal(t, "StatefulSet", res["kind"], "TestKubectStatefulset error")
+    assert.Equal(t, 1, res["replicas"], "TestKubectStatefulset error")
+}
+
+func TestKubectStatefulsetPending(t *testing.T) {
+
+    fileName := filepath.Join(TEST_SRC_DIR, "mongo_pending.json")
+	cmd_json, _ := os.ReadFile(fileName)
+
+	cmd := getCmdKubectl(true, string(cmd_json))
+
+	data := KubectlObject{Name: "dep1", Kind: "Statefulset"}
+
+    res, err := cmd.getStatefulSet(data)
+
+    assert.Nilf(t, err, "error message %s", err)
+    assert.Equal(t, 1, res["unavailableReplicas"], "TestKubectStatefulsetPending error")
+    assert.Equal(t, "StatefulSet", res["kind"], "TestKubectStatefulsetPending error")
+    assert.Equal(t, 1, res["replicas"], "TestKubectStatefulsetPending error")
 }

src/kubectl/statefulset.go

@@ -1,9 +1,9 @@
 package kubectl
 
 import (
-	"fmt"
-	"strings"
-	"errors"
+    "fmt"
+    "strings"
+    "errors"
     "encoding/json"
 
     log "oc-deploy/log_wrapper"
@@ -11,32 +11,32 @@ import (
 
 func (this KubectlCommand) getStatefulSet(data KubectlObject) (map[string]any, error) {
 
-	bin := this.Bin
-	name := data.Name
+    bin := this.Bin
+    name := data.Name
 
-	msg := fmt.Sprintf("%s get statefulset %s -o json", bin, name)
-	log.Log().Debug().Msg(msg)
+    msg := fmt.Sprintf("%s get statefulset %s -o json", bin, name)
+    log.Log().Debug().Msg(msg)
 
-	m := make(map[string]any)
+    m := make(map[string]any)
 
-	cmd_args := strings.Split(msg, " ")
-	cmd := this.Exec(cmd_args[0], cmd_args[1:]...)
-	stdout, err := cmd.CombinedOutput()
-	if err != nil {
-		return m, errors.New(string(stdout))
-	}
+    cmd_args := strings.Split(msg, " ")
+    cmd := this.Exec(cmd_args[0], cmd_args[1:]...)
+    stdout, err := cmd.CombinedOutput()
+    if err != nil {
+        return m, errors.New(string(stdout))
+    }
 
-	var objmap getOutput
+    var objmap getOutput
 
-	json.Unmarshal(stdout, &objmap)
+    json.Unmarshal(stdout, &objmap)
 
-	kind := objmap.Kind
-	status := objmap.Status
+    kind := objmap.Kind
+    status := objmap.Status
 
-	m["name"] = name
-	m["kind"] = kind
-	m["replicas"] = status.Replicas
-	m["UnavailableReplicas"] = status.UnavailableReplicas
+    m["name"] = name
+    m["kind"] = kind
+    m["replicas"] = status.Replicas
+    m["unavailableReplicas"] = status.Replicas - status.AvailableReplicas
 
     return m, nil
 }

src/main.go

@@ -10,7 +10,6 @@ func main() {
     log.InitLog(".oc-deploy")
 
     log.Log().Debug().Msg("Start")
-    log.Log().Info().Msg("oc-deploy :")
 
     cmd.Execute()
 

src/occonst/variables.go

@@ -9,6 +9,10 @@ var OCDEPLOY_ONLINE_REPO = getenv("OCDEPLOY_ONLINE_REPO", "core/oc-version")
 
 var OCDEPLOY_OFFLINE_DIR = getenv("OCDEPLOY_OFFLINE_DIR", "../../offline")
 
+var Version = "dev"
+var Date = "now"
+var GoVersion = ""
+
 func getenv(key string, defaut string) string {
 	value := os.Getenv(key)
 	if len(value) == 0 {

test/chart/oc_oci.yml

@@ -0,0 +1,9 @@
+---
+
+opencloud:
+  - oci:
+      url: oci://harbor.dtf/dev
+    charts:
+      - name: oc-catalog
+        chart: oc-catalog
+        version: 0.1.0

test/kubectl/mongo_pending.json

@@ -0,0 +1,100 @@
+{
+    "apiVersion": "apps/v1",
+    "kind": "StatefulSet",
+    "metadata": {
+        "annotations": {
+            "meta.helm.sh/release-name": "oc-mongo",
+            "meta.helm.sh/release-namespace": "default"
+        },
+        "creationTimestamp": "2024-09-26T07:48:00Z",
+        "generation": 1,
+        "labels": {
+            "app": "mongo",
+            "app.kubernetes.io/managed-by": "Helm"
+        },
+        "name": "mongo",
+        "namespace": "default",
+        "resourceVersion": "13762492",
+        "uid": "9a354ea1-f91f-4b4e-9a8c-622dde93e448"
+    },
+    "spec": {
+        "persistentVolumeClaimRetentionPolicy": {
+            "whenDeleted": "Retain",
+            "whenScaled": "Retain"
+        },
+        "podManagementPolicy": "OrderedReady",
+        "replicas": 1,
+        "revisionHistoryLimit": 10,
+        "selector": {
+            "matchLabels": {
+                "app": "mongo"
+            }
+        },
+        "serviceName": "mongo",
+        "template": {
+            "metadata": {
+                "creationTimestamp": null,
+                "labels": {
+                    "app": "mongo"
+                }
+            },
+            "spec": {
+                "containers": [
+                    {
+                        "image": "harbor.dtf/mongo:v0.1.0",
+                        "imagePullPolicy": "IfNotPresent",
+                        "name": "mongo",
+                        "ports": [
+                            {
+                                "containerPort": 27017,
+                                "protocol": "TCP"
+                            }
+                        ],
+                        "resources": {},
+                        "terminationMessagePath": "/dev/termination-log",
+                        "terminationMessagePolicy": "File",
+                        "volumeMounts": [
+                            {
+                                "mountPath": "/data/db",
+                                "name": "mongo-persistent-storage"
+                            },
+                            {
+                                "mountPath": "/data/configdb",
+                                "name": "mongo-persistent-storage"
+                            }
+                        ]
+                    }
+                ],
+                "dnsPolicy": "ClusterFirst",
+                "restartPolicy": "Always",
+                "schedulerName": "default-scheduler",
+                "securityContext": {},
+                "terminationGracePeriodSeconds": 30,
+                "volumes": [
+                    {
+                        "name": "mongo-persistent-storage",
+                        "persistentVolumeClaim": {
+                            "claimName": "mongo-pvc-helm"
+                        }
+                    }
+                ]
+            }
+        },
+        "updateStrategy": {
+            "rollingUpdate": {
+                "partition": 0
+            },
+            "type": "RollingUpdate"
+        }
+    },
+    "status": {
+        "availableReplicas": 0,
+        "collisionCount": 0,
+        "currentReplicas": 1,
+        "currentRevision": "mongo-7989cd65cb",
+        "observedGeneration": 1,
+        "replicas": 1,
+        "updateRevision": "mongo-7989cd65cb",
+        "updatedReplicas": 1
+    }
+}