moved scripts around

Author: UrielCohen456

Makefile

@@ -1,13 +1,18 @@
 .DEFAULT_GOAL := apply
 
+# Local build
 build:
-	@docker build -t urielc12/argocd-plugin:v0.1.0 .
-	@kind load docker-image urielc12/argocd-plugin:v0.1.0 --name argo-workflows-plugin-argocd
 	@scripts/build_plugin.sh
 
 apply: build
-	@kubectl apply -n argo -f out/argocd-executor-plugin-configmap.yaml
+	@kubectl apply -n argo -f deployments/argocd-executor-plugin-configmap.yaml
 	@kubectl apply -n argo -f examples/rbac.yaml
 
 submit: 
 	@argo submit -n argo examples/argocd-example-wf.yaml
+
+setup:
+	@scripts/create_cluster.sh
+
+clean:
+	@scripts/delete_cluster.sh

build/Dockerfile

@@ -12,7 +12,7 @@ COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
 COPY . .
-RUN GOOS=linux go build -o plugin cmd/main.go
+RUN GOOS=linux go build -o plugin cmd/argocd-plugin/main.go
 
 FROM alpine:3.15
 WORKDIR /app

cmd/argocd-plugin/main.go

@@ -3,10 +3,13 @@ package main
 import (
 	"context"
 	"net/http"
+
+	"github.com/UrielCohen456/argo-workflows-argocd-executor-plugin/common"
+	argocd "github.com/UrielCohen456/argo-workflows-argocd-executor-plugin/internal/argocd-plugin"
 )
 
 func main() {
-	ctx := context.Background()
-	http.HandleFunc("/api/v1/template.execute", ArgocdPlugin(ctx))
+	ctx := context.WithValue(context.Background(), "namespace", common.Namespace());
+	http.HandleFunc("/api/v1/template.execute",  argocd.ArgocdPlugin(ctx))
 	http.ListenAndServe(":4355", nil)
 }

common/common.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 )
 
+// Returns the namespace the pod runs in.
 func Namespace() string {
 	// This way assumes you've set the POD_NAMESPACE environment variable using the downward API.
-	// This check has to be done first for backwards compatibility with the way InClusterConfig was originally set up
 	if ns, ok := os.LookupEnv("POD_NAMESPACE"); ok {
 		return ns
 	}

internal/argocd/plugin.go renamed to internal/argocd-plugin/plugin.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"os/exec"
 
-	"github.com/UrielCohen456/argo-workflows-argocd-executor-plugin/common"
+	// "os/exec"
+
 	// "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -15,13 +15,11 @@ import (
 
 func ArgocdPlugin(ctx context.Context) func(w http.ResponseWriter, req *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
-		ctx := context.WithValue(ctx, "namespace", common.Namespace());
-
-		output, err := exec.Command("argocd").Output()
-		if err!=nil {
-				fmt.Println(err.Error())
-		}
-		fmt.Println(string(output))
+		// output, err := exec.Command("argocd").Output()
+		// if err!=nil {
+		// 		fmt.Println(err.Error())
+		// }
+		// fmt.Println(string(output))
 
 		config, err := rest.InClusterConfig()
 		if err != nil {

internal/argocd/plugin_test.go renamed to internal/argocd-plugin/plugin_test.go

@@ -1,5 +1,5 @@
 #!/bin/env bash
 
 argo executor-plugin build ./deployments
-# mv cmd/README.md out/
-# mv cmd/argocd-executor-plugin-configmap.yaml out/
+docker build -t urielc12/argocd-plugin -f ./build/Dockerfile .
+kind load docker-image urielc12/argocd-plugin --name argo-workflows-plugin-argocd

scripts/build_plugin.sh

@@ -22,7 +22,6 @@ kubectl config set-context --current --namespace argo > /dev/null 2>&1
 echo "Setting up the argo tools..."
 scripts/setup_argo_workflows.sh
 scripts/setup_argocd.sh
-make apply
 
 SECRET=$(kubectl get sa argo-server -n argo -o=jsonpath='{.secrets[0].name}')
 ARGO_TOKEN="Bearer $(kubectl get secret -n argo $SECRET -o=jsonpath='{.data.token}' | base64 --decode)"
@@ -31,9 +30,10 @@ ARGO_TOKEN="Bearer $(kubectl get secret -n argo $SECRET -o=jsonpath='{.data.toke
 echo "----------------------------------------------------------------"
 echo 
 echo "Finished creating the cluster enviornment! To get started: "
-echo "1. Run 'make submit' to create a workflow running the plugin. "
-echo "2. Connect to the argocd server by typing localhost:8080 in your browser"
-echo "3. To connect to the argo server instead of using the argo cli: "
+echo "1. Run 'make apply' to create the plugin."
+echo "2. Run 'make submit' to apply a workflow running the plugin."
+echo "3. Connect to the argocd server by typing localhost:8080 in your browser."
+echo "4. To connect to the argo server instead of using the argo cli: "
 echo "Copy the following token then port forward your argo-server service and use that token to login to it."
 echo 
 echo $ARGO_TOKEN