github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: remove unused docker args code

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-01-18 05:34:35 -05:00
parent 8b8444fb1f
commit 3f7e1d161a
1 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/scheduler-k3s/triggers.go
View File

@@ -19,7 +19,6 @@ import (
"github.com/dokku/dokku/plugins/common" "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config" "github.com/dokku/dokku/plugins/config"
"github.com/fatih/color" "github.com/fatih/color"
"github.com/kballard/go-shellquote"
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
orderedmap "github.com/wk8/go-ordered-map/v2" orderedmap "github.com/wk8/go-ordered-map/v2"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
@@ -803,30 +802,11 @@ func TriggerSchedulerRun(scheduler string, appName string, envCount int, args []
labels["dokku.com/cron-id"] = os.Getenv("DOKKU_CRON_ID") labels["dokku.com/cron-id"] = os.Getenv("DOKKU_CRON_ID")
} }
dockerArgs := []string{}
if b, err := common.PlugnTriggerSetup("docker-args-run", []string{appName, imageTag}...).SetInput("").Output(); err == nil {
words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
if err != nil {
return err
}
dockerArgs = append(dockerArgs, words...)
}
imageSourceType, err := common.DockerInspect(image, "{{ index .Config.Labels \"com.dokku.builder-type\" }}") imageSourceType, err := common.DockerInspect(image, "{{ index .Config.Labels \"com.dokku.builder-type\" }}")
if err != nil { if err != nil {
return fmt.Errorf("Error getting image builder type: %w", err) return fmt.Errorf("Error getting image builder type: %w", err)
} }
if b, err := common.PlugnTriggerSetup("docker-args-process-run", []string{appName, imageSourceType, imageTag}...).SetInput("").Output(); err == nil {
words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
if err != nil {
return err
}
dockerArgs = append(dockerArgs, words...)
}
// todo: do something with docker args // todo: do something with docker args
command := args command := args
if len(args) == 0 { if len(args) == 0 {
@@ -1067,23 +1047,6 @@ func isPodReady(ctx context.Context, clientset KubernetesClient, podName, namesp
} }
} }
func isPodComplete(ctx context.Context, clientset KubernetesClient, podName, namespace string) wait.ConditionWithContextFunc {
return func(ctx context.Context) (bool, error) {
fmt.Printf(".") // progress bar!
pod, err := clientset.Client.CoreV1().Pods(namespace).Get(ctx, podName, metav1.GetOptions{})
if err != nil {
return false, err
}
switch pod.Status.Phase {
case v1.PodFailed, v1.PodSucceeded:
return true, nil
}
return false, nil
}
}
type WaitForPodBySelectorRunningInput struct { type WaitForPodBySelectorRunningInput struct {
Clientset KubernetesClient Clientset KubernetesClient
Namespace string Namespace string