setup /v2/skaffoldLogs endpoint (GoogleContainerTools#5951)

.github/workflows/integration-linux.yml

@@ -1,8 +1,7 @@
 name: release (linux)
 
-on:
-  schedule:
-  - cron: "0 10 * * *"
+# Triggers the workflow on push or pull request events
+on: [push, pull_request]
 
 jobs:
 
@@ -14,9 +13,9 @@ jobs:
         kustomize_version: [3.5.4]
         ko_version: [0.4.0]
         kompose_version: [1.21.0]
-        gcloud_sdk_version: [276.0.0]
+        gcloud_sdk_version: [343.0.0]
         container_structure_tests_version: [1.8.0]
-        minikube_version: [1.11.0]
+        minikube_version: [1.20.0]
         integration_test_partitions: [0, 1, 2, 3]
     steps:
 
@@ -72,16 +71,25 @@ jobs:
         echo '{}' > /home/$(whoami)/.docker/config.json
         mkdir -p /home/$(whoami)/.m2/ && cp ./hack/maven/settings.xml /home/$(whoami)/.m2/settings.xml
 
+    # - name: Setup other files and permissions
+    #   run: |
+    #     sudo chown $(whoami) /home/$(whoami)/.config/gcloud -R
+    #     sudo chmod g+rw /home/$(whoami)/.config/gcloud -R
+    #     sudo chown $(whoami):docker /home/$(whoami)/.docker -R
+    #     sudo chmod g+rw /home/$(whoami)/.docker -R
+    #     echo '{}' > /home/$(whoami)/.docker/config.json
+    #     mkdir -p /home/$(whoami)/.m2/ && cp ./hack/maven/settings.xml /home/$(whoami)/.m2/settings.xml
+
     - name: Install Minikube and start cluster
       run: |
         curl -Lo minikube https://storage.googleapis.com/minikube/releases/v${{ matrix.minikube_version }}/minikube-linux-amd64
         sudo install minikube /usr/local/bin/minikube
         minikube start --profile=minikube --driver=docker
 
-    - name: Install Skaffold release binary
+    - name: Make and Install Skaffold binary from current PR
       run: |
-        curl -Lo skaffold https://storage.googleapis.com/skaffold/builds/${{ env.SKAFFOLD_VERSION }}/skaffold-linux-amd64
-        sudo install skaffold /usr/local/bin/skaffold
+        make
+        sudo install "/home/$(whoami)/work/skaffold/skaffold/out/skaffold" /usr/local/bin/skaffold
 
     - name: Run integration tests
       env:

pkg/skaffold/event/v2/event.go

@@ -68,6 +68,8 @@ type eventHandler struct {
 	logLock             sync.Mutex
 	applicationLogs     []proto.Event
 	applicationLogsLock sync.Mutex
+	skaffoldLogs        []proto.Event
+	skaffoldLogsLock    sync.Mutex
 	cfg                 Config
 
 	iteration               int
@@ -76,6 +78,7 @@ type eventHandler struct {
 	eventChan               chan *proto.Event
 	eventListeners          []*listener
 	applicationLogListeners []*listener
+	skaffoldLogListeners    []*listener
 }
 
 type listener struct {
@@ -101,6 +104,10 @@ func ForEachApplicationLog(callback func(*proto.Event) error) error {
 	return handler.forEachApplicationLog(callback)
 }
 
+func ForEachSkaffoldLog(callback func(*proto.Event) error) error {
+	return handler.forEachSkaffoldLog(callback)
+}
+
 func Handle(event *proto.Event) error {
 	if event != nil {
 		handler.handle(event)
@@ -178,6 +185,10 @@ func (ev *eventHandler) forEachApplicationLog(callback func(*proto.Event) error)
 	return ev.forEach(&ev.applicationLogListeners, &ev.applicationLogs, &ev.applicationLogsLock, callback)
 }
 
+func (ev *eventHandler) forEachSkaffoldLog(callback func(*proto.Event) error) error {
+	return ev.forEach(&ev.skaffoldLogListeners, &ev.skaffoldLogs, &ev.skaffoldLogsLock, callback)
+}
+
 func emptyState(cfg Config) proto.State {
 	builds := map[string]string{}
 	for _, p := range cfg.GetPipelines() {

pkg/skaffold/server/v2/endpoints.go

@@ -46,6 +46,10 @@ func (s *Server) ApplicationLogs(_ *empty.Empty, stream proto.SkaffoldV2Service_
 	return event.ForEachApplicationLog(stream.Send)
 }
 
+func (s *Server) SkaffoldLogs(_ *empty.Empty, stream proto.SkaffoldV2Service_SkaffoldLogsServer) error {
+	return event.ForEachSkaffoldLog(stream.Send)
+}
+
 func (s *Server) Handle(ctx context.Context, e *proto.Event) (*empty.Empty, error) {
 	return &empty.Empty{}, event.Handle(e)
 }