fix: minor fix for CI (#899)

Co-authored-by: Ryan Zhang <[email protected]>
Azure · Aug 16, 2024 · b53ed50 · b53ed50
1 parent 6d49285
commit b53ed50
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 44,7 @@ jobs:
 
  - name: Set up Ginkgo CLI
  run: |
- go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.5
  go install github.com/onsi/ginkgo/v2/ginkgo@v2.19.1
 
  - name: Run unit tests & Generate coverage
  run: make test
@@ -109,13 109,13 @@ jobs:
 
  - name: Install Ginkgo CLI
  run: |
- go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
  go install github.com/onsi/ginkgo/v2/ginkgo@v2.19.1
  
  - name: Install Kind
  # Before updating the kind version to use, verify that the current kind image
  # is still supported by the version.
  run: |
- go install sigs.k8s.io/kind@v0.20.0
  go install sigs.k8s.io/kind@v0.22.0
 
  - name: Run e2e tests
  run: |

diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile
@@ -1,5 1,5 @@
 # Build the hubagent binary
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 as builder
 FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/docker/member-agent.Dockerfile b/docker/member-agent.Dockerfile
@@ -1,5 1,5 @@
 # Build the memberagent binary
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 as builder
 FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/docker/refresh-token.Dockerfile b/docker/refresh-token.Dockerfile
@@ -1,5 1,5 @@
 # Build the hubagent binary
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 as builder
 FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22.4 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/go.mod b/go.mod
@@ -10,8 10,8 @@ require (
  github.com/evanphx/json-patch/v5 v5.9.0
  github.com/go-logr/logr v1.4.2
  github.com/google/go-cmp v0.6.0
- github.com/onsi/ginkgo/v2 v2.17.2
- github.com/onsi/gomega v1.33.1
  github.com/onsi/ginkgo/v2 v2.19.1
  github.com/onsi/gomega v1.34.0
  github.com/prometheus/client_golang v1.19.1
  github.com/prometheus/client_model v0.6.1
  github.com/spf13/cobra v1.8.0

diff --git a/go.sum b/go.sum
@@ -151,10 151,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1: n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
-github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT 9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
 github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA=
 github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig CblTc4AxpPBykhe2Os=
 github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c f QLWk hxbePD4i0LMJSExPaZOVfkoex4cAo=
 github.com/patrickmn/go-cache v2.1.0 incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0 incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6 WQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1: mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=

diff --git a/pkg/controllers/workgenerator/controller.go b/pkg/controllers/workgenerator/controller.go
@@ -687,7 687,7 @@ func buildAllWorkAvailableCondition(works map[string]*fleetv1beta1.Work, binding
  }
  }
  if allAvailable {
- klog.V(2).InfoS("All works associated with the binding are available", "binding", klog.KObj(binding))
  klog.V(2).InfoS("All works associated with the binding are available", "binding", klog.KObj(binding), "notTrackableWork", notTrackableWork)
  reason := condition.AllWorkAvailableReason
  message := "All corresponding work objects are available"
  if len(notTrackableWork) > 0 {