renamed run skopeo pod method

damoon · May 24, 2021 · fd7ab74 · fd7ab74
1 parent c362073
commit fd7ab74
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pkg/inspect.go b/pkg/inspect.go
@@ -24,7 +24,7 @@ rm -r %s
 `, randomID, image, randomID, randomID, randomID)
 
 	o := &bytes.Buffer{}
-	err := s.scheduleInKubernetes(r.Context(), o, "inspect", script, "")
+	err := s.runSkopeoPod(r.Context(), o, "inspect", script, "")
 	if err != nil {
 		log.Printf("execute inspect: %v", err)
 		w.WriteHeader(http.StatusNotFound)

diff --git a/pkg/kubernetes.go b/pkg/kubernetes.go
@@ -15,7 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func (s Service) scheduleInKubernetes(ctx context.Context, w io.Writer, processName, script, dockerJSON string) error {
+func (s Service) runSkopeoPod(ctx context.Context, w io.Writer, processName, script, dockerJSON string) error {
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: fmt.Sprintf("wedding-%s-", processName),

diff --git a/pkg/pull.go b/pkg/pull.go
@@ -61,7 +61,7 @@ func (s Service) pullImage(w http.ResponseWriter, r *http.Request) {
 	script := fmt.Sprintf(`skopeo copy --retry-times 3 --dest-tls-verify=false docker://%s docker://%s`, from, to)
 
 	o := &output{w: w}
-	err = s.scheduleInKubernetes(r.Context(), o, "pull", script, dockerCfg.mustToJSON())
+	err = s.runSkopeoPod(r.Context(), o, "pull", script, dockerCfg.mustToJSON())
 	if err != nil {
 		log.Printf("execute pull: %v", err)
 		o.Errorf("execute pull: %v", err)

diff --git a/pkg/push.go b/pkg/push.go
@@ -27,7 +27,7 @@ func (s Service) pushImage(w http.ResponseWriter, r *http.Request) {
 	script := fmt.Sprintf(`skopeo copy --retry-times 3 --src-tls-verify=false --dest-tls-verify=false docker://%s docker://%s`, from, to)
 
 	o := &output{w: w}
-	err = s.scheduleInKubernetes(r.Context(), o, "push", script, dockerCfg.mustToJSON())
+	err = s.runSkopeoPod(r.Context(), o, "push", script, dockerCfg.mustToJSON())
 	if err != nil {
 		log.Printf("execute push: %v", err)
 		o.Errorf("execute push: %v", err)

diff --git a/pkg/tag.go b/pkg/tag.go
@@ -35,7 +35,7 @@ func (s Service) tagImage(w http.ResponseWriter, r *http.Request) {
 	script := fmt.Sprintf(`skopeo copy --retry-times 3 --src-tls-verify=false --dest-tls-verify=false docker://%s docker://%s`, from, to)
 
 	o := &bytes.Buffer{}
-	err := s.scheduleInKubernetes(r.Context(), o, "tag", script, "")
+	err := s.runSkopeoPod(r.Context(), o, "tag", script, "")
 	if err != nil {
 		log.Printf("execute tag: %v", err)
 		w.WriteHeader(http.StatusInternalServerError)