Merge gitcloner into fleetcli

TODO
* move source to internal?

.github/scripts/build-fleet-binaries.sh

@@ -15,5 +15,4 @@ go build -gcflags='all=-N -l' -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
 go build -gcflags='all=-N -l' -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
 
 # gitjob
-go build -gcflags='all=-N -l' -o "bin/gitcloner-linux-$GOARCH" ./cmd/gitcloner
 go build -gcflags='all=-N -l' -o "bin/gitjob-linux-$GOARCH" ./cmd/gitjob

.goreleaser.yml

@@ -20,12 +20,6 @@ archives:
     builds:
       - fleet-agent
 
-  - id: fleet-gitcloner
-    format: binary
-    name_template: "{{ .Binary }}"
-    builds:
-      - fleet-gitcloner
-
   - id: fleet-gitjob
     format: binary
     name_template: "{{ .Binary }}"
@@ -66,18 +60,6 @@ builds:
     - linux_amd64_v1
     - linux_arm64
     - windows_amd64
-  -
-    id: fleet-gitcloner
-    main: ./cmd/gitcloner
-    binary: gitcloner-{{ .Os }}-{{ .Arch }}{{ if .Arm }}64{{ end }}
-    no_unique_dist_dir: true
-    ldflags:
-      - -w -s
-      - -X github.com/rancher/fleet/pkg/version.GitCommit={{ .Commit }}
-      - -X github.com/rancher/fleet/pkg/version.Version={{ .Tag }}
-    targets:
-    - linux_amd64_v1
-    - linux_arm64
   -
     id: fleet-gitjob
     main: ./cmd/gitjob
@@ -130,7 +112,6 @@ dockers:
     ids:
     - fleet-controller
     - fleet-cli
-    - fleet-gitcloner
     - fleet-gitjob
 
     # Templates of the Docker image names.
@@ -159,7 +140,6 @@ dockers:
     ids:
     - fleet-controller
     - fleet-cli
-    - fleet-gitcloner
     - fleet-gitjob
     image_templates:
     - "docker.io/rancher/fleet:{{ .Tag }}-linux-arm64"

dev/build-fleet

@@ -18,7 +18,6 @@ fi
 
 export GOOS=linux
 # gitjob
-go build -gcflags='all=-N -l' -o "bin/gitcloner-linux-$GOARCH" ./cmd/gitcloner
 go build -gcflags='all=-N -l' -o "bin/gitjob-linux-$GOARCH" ./cmd/gitjob
 
 # fleet

internal/cmd/cli/root.go

@@ -4,6 +4,8 @@ package cli
 import (
 	"github.com/spf13/cobra"
 
+	gitcmd "github.com/rancher/fleet/cmd/gitcloner/cmd"
+	"github.com/rancher/fleet/cmd/gitcloner/gogit"
 	"github.com/rancher/fleet/internal/client"
 	command "github.com/rancher/fleet/internal/cmd"
 	"github.com/rancher/fleet/pkg/version"
@@ -32,6 +34,7 @@ func App() *cobra.Command {
 
 		NewTarget(),
 		NewDeploy(),
+		gitcmd.New(gogit.NewCloner()),
 	)
 
 	return root

internal/cmd/gitjob/gitjob.go

@@ -610,7 +610,7 @@ func volumesFromSecret(
 }
 
 func (r *GitJobReconciler) generateInitContainer(ctx context.Context, obj *v1alpha1.GitRepo) (corev1.Container, error) {
-	args := []string{obj.Spec.Repo, "/workspace"}
+	args := []string{"gitcloner", obj.Spec.Repo, "/workspace"}
 	volumeMounts := []corev1.VolumeMount{
 		{
 			Name:      gitClonerVolumeName,
@@ -673,7 +673,7 @@ func (r *GitJobReconciler) generateInitContainer(ctx context.Context, obj *v1alp
 
 	return corev1.Container{
 		Command: []string{
-			"gitcloner",
+			"fleet",
 		},
 		Args:         args,
 		Image:        r.Image,

package/Dockerfile

@@ -12,21 +12,18 @@ ONBUILD ARG ARCH
 ONBUILD COPY bin/fleetcontroller-linux-$ARCH /usr/bin/fleetcontroller
 ONBUILD COPY bin/fleet-linux-$ARCH /usr/bin/fleet
 ONBUILD COPY bin/gitjob-linux-$ARCH /usr/bin/gitjob
-ONBUILD COPY bin/gitcloner-linux-$ARCH /usr/bin/gitcloner
 
 FROM base AS copy_buildx
 ONBUILD ARG TARGETARCH
 ONBUILD COPY bin/fleetcontroller-linux-$TARGETARCH /usr/bin/fleetcontroller
 ONBUILD COPY bin/fleet-linux-$TARGETARCH /usr/bin/fleet
 ONBUILD COPY bin/gitjob-linux-$TARGETARCH /usr/bin/gitjob
-ONBUILD COPY bin/gitcloner-linux-$TARGETARCH /usr/bin/gitcloner
 
 FROM base AS copy_goreleaser
 ONBUILD ARG ARCH
 ONBUILD COPY fleetcontroller-linux-$ARCH /usr/bin/fleetcontroller
 ONBUILD COPY fleet-linux-$ARCH /usr/bin/fleet
 ONBUILD COPY gitjob-linux-$ARCH /usr/bin/gitjob
-ONBUILD COPY gitcloner-linux-$ARCH /usr/bin/gitcloner
 
 FROM copy_${BUILD_ENV}
 USER 1000