Update go.mod and Prometheus version

Updates various internal dependencies in go.mod, and Prometheus within docker-compose.yaml Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
openfaas · Dec 11, 2023 · f17a25f · f17a25f
1 parent 7ef56d8
commit f17a25f
Show file tree

Hide file tree

Showing 393 changed files with 1,959 additions and 3,394 deletions.
diff --git a/cmd/provider.go b/cmd/provider.go
@@ -32,88 +32,91 @@ func makeProviderCmd() *cobra.Command {
 
 	command.Flags().String("pull-policy", "Always", `Set to "Always" to force a pull of images upon deployment, or "IfNotPresent" to try to use a cached image.`)
 
-	command.RunE = func(_ *cobra.Command, _ []string) error {
+	command.RunE = runProviderE
 
-		pullPolicy, flagErr := command.Flags().GetString("pull-policy")
-		if flagErr != nil {
-			return flagErr
-		}
+	return command
+}
 
-		alwaysPull := false
-		if pullPolicy == "Always" {
-			alwaysPull = true
-		}
+func runProviderE(cmd *cobra.Command, _ []string) error {
 
-		config, providerConfig, err := config.ReadFromEnv(types.OsEnv{})
-		if err != nil {
-			return err
-		}
+	pullPolicy, flagErr := cmd.Flags().GetString("pull-policy")
+	if flagErr != nil {
+		return flagErr
+	}
 
-		log.Printf("faasd-provider starting..\tService Timeout: %s\n", config.WriteTimeout.String())
-		printVersion()
+	alwaysPull := false
+	if pullPolicy == "Always" {
+		alwaysPull = true
+	}
 
-		wd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
+	config, providerConfig, err := config.ReadFromEnv(types.OsEnv{})
+	if err != nil {
+		return err
+	}
 
-		writeHostsErr := ioutil.WriteFile(path.Join(wd, "hosts"),
-			[]byte(`127.0.0.1	localhost`), workingDirectoryPermission)
+	log.Printf("faasd-provider starting..\tService Timeout: %s\n", config.WriteTimeout.String())
+	printVersion()
 
-		if writeHostsErr != nil {
-			return fmt.Errorf("cannot write hosts file: %s", writeHostsErr)
-		}
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
 
-		writeResolvErr := ioutil.WriteFile(path.Join(wd, "resolv.conf"),
-			[]byte(`nameserver 8.8.8.8`), workingDirectoryPermission)
+	writeHostsErr := ioutil.WriteFile(path.Join(wd, "hosts"),
+		[]byte(`127.0.0.1	localhost`), workingDirectoryPermission)
 
-		if writeResolvErr != nil {
-			return fmt.Errorf("cannot write resolv.conf file: %s", writeResolvErr)
-		}
+	if writeHostsErr != nil {
+		return fmt.Errorf("cannot write hosts file: %s", writeHostsErr)
+	}
 
-		cni, err := cninetwork.InitNetwork()
-		if err != nil {
-			return err
-		}
+	writeResolvErr := ioutil.WriteFile(path.Join(wd, "resolv.conf"),
+		[]byte(`nameserver 8.8.8.8`), workingDirectoryPermission)
 
-		client, err := containerd.New(providerConfig.Sock)
-		if err != nil {
-			return err
-		}
+	if writeResolvErr != nil {
+		return fmt.Errorf("cannot write resolv.conf file: %s", writeResolvErr)
+	}
 
-		defer client.Close()
+	cni, err := cninetwork.InitNetwork()
+	if err != nil {
+		return err
+	}
 
-		invokeResolver := handlers.NewInvokeResolver(client)
+	client, err := containerd.New(providerConfig.Sock)
+	if err != nil {
+		return err
+	}
 
-		baseUserSecretsPath := path.Join(wd, "secrets")
-		if err := moveSecretsToDefaultNamespaceSecrets(
-			baseUserSecretsPath,
-			faasd.DefaultFunctionNamespace); err != nil {
-			return err
-		}
+	defer client.Close()
 
-		bootstrapHandlers := types.FaaSHandlers{
-			FunctionProxy:   proxy.NewHandlerFunc(*config, invokeResolver, false),
-			DeleteFunction:  handlers.MakeDeleteHandler(client, cni),
-			DeployFunction:  handlers.MakeDeployHandler(client, cni, baseUserSecretsPath, alwaysPull),
-			FunctionLister:  handlers.MakeReadHandler(client),
-			FunctionStatus:  handlers.MakeReplicaReaderHandler(client),
-			ScaleFunction:   handlers.MakeReplicaUpdateHandler(client, cni),
-			UpdateFunction:  handlers.MakeUpdateHandler(client, cni, baseUserSecretsPath, alwaysPull),
-			Health:          func(w http.ResponseWriter, r *http.Request) {},
-			Info:            handlers.MakeInfoHandler(Version, GitCommit),
-			ListNamespaces:  handlers.MakeNamespacesLister(client),
-			Secrets:         handlers.MakeSecretHandler(client.NamespaceService(), baseUserSecretsPath),
-			Logs:            logs.NewLogHandlerFunc(faasdlogs.New(), config.ReadTimeout),
-			MutateNamespace: handlers.MakeMutateNamespace(client),
-		}
+	invokeResolver := handlers.NewInvokeResolver(client)
 
-		log.Printf("Listening on: 0.0.0.0:%d\n", *config.TCPPort)
-		bootstrap.Serve(&bootstrapHandlers, config)
-		return nil
+	baseUserSecretsPath := path.Join(wd, "secrets")
+	if err := moveSecretsToDefaultNamespaceSecrets(
+		baseUserSecretsPath,
+		faasd.DefaultFunctionNamespace); err != nil {
+		return err
 	}
 
-	return command
+	bootstrapHandlers := types.FaaSHandlers{
+		FunctionProxy:   proxy.NewHandlerFunc(*config, invokeResolver, false),
+		DeleteFunction:  handlers.MakeDeleteHandler(client, cni),
+		DeployFunction:  handlers.MakeDeployHandler(client, cni, baseUserSecretsPath, alwaysPull),
+		FunctionLister:  handlers.MakeReadHandler(client),
+		FunctionStatus:  handlers.MakeReplicaReaderHandler(client),
+		ScaleFunction:   handlers.MakeReplicaUpdateHandler(client, cni),
+		UpdateFunction:  handlers.MakeUpdateHandler(client, cni, baseUserSecretsPath, alwaysPull),
+		Health:          func(w http.ResponseWriter, r *http.Request) {},
+		Info:            handlers.MakeInfoHandler(Version, GitCommit),
+		ListNamespaces:  handlers.MakeNamespacesLister(client),
+		Secrets:         handlers.MakeSecretHandler(client.NamespaceService(), baseUserSecretsPath),
+		Logs:            logs.NewLogHandlerFunc(faasdlogs.New(), config.ReadTimeout),
+		MutateNamespace: handlers.MakeMutateNamespace(client),
+	}
+
+	log.Printf("Listening on: 0.0.0.0:%d\n", *config.TCPPort)
+	bootstrap.Serve(cmd.Context(), &bootstrapHandlers, config)
+	return nil
+
 }
 
 /*

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
     #    - "127.0.0.1:8222:8222"
 
   prometheus:
-    image: docker.io/prom/prometheus:v2.48.0
+    image: docker.io/prom/prometheus:v2.48.1
 # nobody
     user: "65534"
     volumes:

diff --git a/go.mod b/go.mod
@@ -3,27 +3,27 @@ module github.com/openfaas/faasd
 go 1.20
 
 require (
-	github.com/alexellis/arkade v0.0.0-20231006152949-5e9871661bc5
+	github.com/alexellis/arkade v0.0.0-20231211105357-97fb24a99b88
 	github.com/compose-spec/compose-go v0.0.0-20200528042322-36d8ce368e05
 	github.com/containerd/containerd v1.7.0
 	github.com/containerd/go-cni v1.1.9
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
-	github.com/docker/cli v24.0.6+incompatible
+	github.com/docker/cli v24.0.7+incompatible
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v24.0.6+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-units v0.5.0
-	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/mux v1.8.1
 	github.com/morikuni/aec v1.0.0
-	github.com/opencontainers/runtime-spec v1.1.0-rc.3
-	github.com/openfaas/faas-provider v0.24.4
+	github.com/opencontainers/runtime-spec v1.1.0
+	github.com/openfaas/faas-provider v0.25.0
 	github.com/pkg/errors v0.9.1
 	github.com/sethvargo/go-password v0.2.0
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/vishvananda/netns v0.0.4
-	golang.org/x/sys v0.13.0
-	k8s.io/apimachinery v0.28.3
+	golang.org/x/sys v0.15.0
+	k8s.io/apimachinery v0.28.4
 )
 
 require github.com/alexellis/go-execute/v2 v2.2.1
@@ -78,11 +78,11 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel v1.14.0 // indirect
 	go.opentelemetry.io/otel/trace v1.14.0 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sync v0.4.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.56.3 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect