Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update cosmtrek/air project link to air-verse/air #9132

Merged
merged 1 commit into from
Jun 12, 2024
Merged

fix: update cosmtrek/air project link to air-verse/air #9132

merged 1 commit into from
Jun 12, 2024

Conversation

r-yabyab
Copy link
Contributor

Update Air's project link and version to reflect their changes in #602

The change broke the Air dependency for dashboard's local environment scripts via make:

 > [scraper air 2/2] RUN go install github.com/cosmtrek/air@latest:
1.217 go: downloading github.com/cosmtrek/air v1.52.2
1.335 go: github.com/cosmtrek/air@latest: version constraints conflict:
1.335   github.com/cosmtrek/air@v1.52.2: parsing go.mod:
1.335   module declares its path as: github.com/air-verse/air
1.335           but was required as: github.com/cosmtrek/air
------

Ran make test and manually tested dev and prod versions:

ubuntu@ip:~/dashboard$ make test
[tools] node version requirements met
[tools] yarn already exists
[tools] golang version requirements met
[tools] license-eye already exists
[tools] air already exists
[tools] golangci-lint already exists
[tools] client-gen already exists
[tools] kind already exists
[root] Cleaning up
[dashboard-api] Cleaning up
[dashboard-auth] Cleaning up
[dashboard-metrics-scraper] Cleaning up
[dashboard-web] Cleaning up
[dashboard-api] Running tests
go: downloading github.com/emicklei/go-restful-openapi/v2 v2.10.2
go: downloading github.com/emicklei/go-restful/v3 v3.12.1
go: downloading github.com/go-openapi/spec v0.21.0
go: downloading gopkg.in/igm/sockjs-go.v2 v2.1.0
go: downloading k8s.io/api v0.30.0
go: downloading k8s.io/apimachinery v0.30.0
go: downloading k8s.io/client-go v0.30.0
go: downloading k8s.io/apiextensions-apiserver v0.30.0
go: downloading github.com/docker/distribution v2.8.3+incompatible
go: downloading github.com/gobuffalo/flect v1.0.2
go: downloading github.com/gin-gonic/gin v1.10.0
go: downloading github.com/go-openapi/jsonpointer v0.21.0
go: downloading github.com/go-openapi/jsonreference v0.21.0
go: downloading github.com/go-openapi/swag v0.23.0
go: downloading github.com/gorilla/websocket v1.5.1
go: downloading k8s.io/utils v0.0.0-20230726121419-3b25d923346b
go: downloading github.com/gogo/protobuf v1.3.2
go: downloading github.com/google/gofuzz v1.2.0
go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.4.1
go: downloading gopkg.in/inf.v0 v0.9.1
go: downloading github.com/golang/protobuf v1.5.4
go: downloading github.com/google/gnostic-models v0.6.8
go: downloading github.com/distribution/reference v0.5.0
go: downloading github.com/opencontainers/go-digest v1.0.0
go: downloading golang.org/x/term v0.20.0
go: downloading github.com/gin-contrib/sse v0.1.0
go: downloading github.com/mailru/easyjson v0.7.7
go: downloading sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
go: downloading golang.org/x/time v0.5.0
go: downloading github.com/json-iterator/go v1.1.12
go: downloading k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
go: downloading github.com/go-playground/validator/v10 v10.20.0
go: downloading github.com/ugorji/go/codec v1.2.12
go: downloading github.com/josharian/intern v1.0.0
go: downloading github.com/moby/spdystream v0.2.0
go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
go: downloading github.com/modern-go/reflect2 v1.0.2
go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
go: downloading github.com/gabriel-vasile/mimetype v1.4.3
go: downloading github.com/go-playground/universal-translator v0.18.1
go: downloading github.com/leodido/go-urn v1.4.0
go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
go: downloading github.com/go-playground/locales v0.14.1
?       k8s.io/dashboard/api    [no test files]
?       k8s.io/dashboard/api/pkg/environment    [no test files]
?       k8s.io/dashboard/api/pkg/args   [no test files]
?       k8s.io/dashboard/api/pkg/handler/parser [no test files]
ok      k8s.io/dashboard/api/pkg/handler        0.079s
?       k8s.io/dashboard/api/pkg/integration/api        [no test files]
ok      k8s.io/dashboard/api/pkg/integration    0.048s
?       k8s.io/dashboard/api/pkg/integration/metric/api [no test files]
ok      k8s.io/dashboard/api/pkg/integration/metric     0.081s
ok      k8s.io/dashboard/api/pkg/integration/metric/common      0.011s
ok      k8s.io/dashboard/api/pkg/integration/metric/sidecar     0.701s
ok      k8s.io/dashboard/api/pkg/resource/clusterrole   0.013s
ok      k8s.io/dashboard/api/pkg/resource/clusterrolebinding    0.017s
ok      k8s.io/dashboard/api/pkg/resource/common        0.018s
ok      k8s.io/dashboard/api/pkg/resource/configmap     0.019s
ok      k8s.io/dashboard/api/pkg/resource/container     0.018s
ok      k8s.io/dashboard/api/pkg/resource/controller    0.034s
ok      k8s.io/dashboard/api/pkg/resource/cronjob       0.018s
?       k8s.io/dashboard/api/pkg/resource/customresourcedefinition/types        [no test files]
ok      k8s.io/dashboard/api/pkg/resource/customresourcedefinition      0.036s
ok      k8s.io/dashboard/api/pkg/resource/customresourcedefinition/v1   0.017s
ok      k8s.io/dashboard/api/pkg/resource/daemonset     0.029s
ok      k8s.io/dashboard/api/pkg/resource/dataselect    0.007s
?       k8s.io/dashboard/api/pkg/resource/endpoint      [no test files]
ok      k8s.io/dashboard/api/pkg/resource/deployment    0.030s
ok      k8s.io/dashboard/api/pkg/resource/event 0.029s
?       k8s.io/dashboard/api/pkg/resource/ingress       [no test files]
ok      k8s.io/dashboard/api/pkg/resource/horizontalpodautoscaler       0.025s
ok      k8s.io/dashboard/api/pkg/resource/ingressclass  0.023s
ok      k8s.io/dashboard/api/pkg/resource/job   0.026s
?       k8s.io/dashboard/api/pkg/resource/logs  [no test files]
ok      k8s.io/dashboard/api/pkg/resource/limitrange    0.005s
?       k8s.io/dashboard/api/pkg/resource/networkpolicy [no test files]
ok      k8s.io/dashboard/api/pkg/resource/namespace     0.019s
ok      k8s.io/dashboard/api/pkg/resource/node  0.024s
ok      k8s.io/dashboard/api/pkg/resource/persistentvolume      0.106s
ok      k8s.io/dashboard/api/pkg/resource/persistentvolumeclaim 0.024s
ok      k8s.io/dashboard/api/pkg/resource/pod   0.028s
ok      k8s.io/dashboard/api/pkg/resource/replicaset    0.024s
ok      k8s.io/dashboard/api/pkg/resource/replicationcontroller 0.026s
ok      k8s.io/dashboard/api/pkg/resource/resourcequota 0.006s
ok      k8s.io/dashboard/api/pkg/resource/role  0.017s
ok      k8s.io/dashboard/api/pkg/resource/rolebinding   0.032s
ok      k8s.io/dashboard/api/pkg/resource/secret        0.018s
?       k8s.io/dashboard/api/pkg/resource/serviceaccount        [no test files]
ok      k8s.io/dashboard/api/pkg/resource/service       0.027s
ok      k8s.io/dashboard/api/pkg/resource/statefulset   0.018s
?       k8s.io/dashboard/api/pkg/scaling        [no test files]
ok      k8s.io/dashboard/api/pkg/resource/storageclass  0.030s
ok      k8s.io/dashboard/api/pkg/validation     0.018s
[dashboard-auth] Running tests
go: downloading github.com/golang-jwt/jwt/v4 v4.5.0
?       k8s.io/dashboard/auth   [no test files]
?       k8s.io/dashboard/auth/pkg/args  [no test files]
?       k8s.io/dashboard/auth/pkg/environment   [no test files]
?       k8s.io/dashboard/auth/pkg/router        [no test files]
?       k8s.io/dashboard/auth/pkg/routes/csrftoken      [no test files]
?       k8s.io/dashboard/auth/pkg/routes/login  [no test files]
?       k8s.io/dashboard/auth/pkg/routes/me     [no test files]
?       k8s.io/dashboard/auth/api/v1    [no test files]
[dashboard-metrics-scraper] Running tests
go: downloading github.com/gorilla/mux v1.8.0
go: downloading modernc.org/sqlite v1.29.1
go: downloading github.com/gorilla/handlers v1.5.1
go: downloading k8s.io/metrics v0.30.0
go: downloading github.com/onsi/ginkgo v1.16.4
go: downloading github.com/onsi/gomega v1.33.1
go: downloading github.com/felixge/httpsnoop v1.0.3
go: downloading github.com/nxadm/tail v1.4.8
go: downloading gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
go: downloading modernc.org/libc v1.41.0
go: downloading github.com/ncruces/go-strftime v0.1.9
go: downloading github.com/dustin/go-humanize v1.0.1
go: downloading modernc.org/mathutil v1.6.0
go: downloading modernc.org/memory v1.7.2
go: downloading github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec
?       k8s.io/dashboard/metrics-scraper        [no test files]
?       k8s.io/dashboard/metrics-scraper/pkg/api        [no test files]
?       k8s.io/dashboard/metrics-scraper/pkg/api/dashboard      [no test files]
?       k8s.io/dashboard/metrics-scraper/pkg/args       [no test files]
?       k8s.io/dashboard/metrics-scraper/pkg/environment        [no test files]
ok      k8s.io/dashboard/metrics-scraper/pkg/database   0.011s
[dashboard-web] Running tests
go: downloading github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2
go: downloading github.com/samber/lo v1.39.0
?       k8s.io/dashboard/web    [no test files]
?       k8s.io/dashboard/web/pkg/args   [no test files]
?       k8s.io/dashboard/web/pkg/config [no test files]
?       k8s.io/dashboard/web/pkg/environment    [no test files]
?       k8s.io/dashboard/web/pkg/locale [no test files]
?       k8s.io/dashboard/web/pkg/router [no test files]
?       k8s.io/dashboard/web/pkg/settings       [no test files]
?       k8s.io/dashboard/web/pkg/systembanner   [no test files]
[common.certificates] Running tests
?       k8s.io/dashboard/certificates   [no test files]
?       k8s.io/dashboard/certificates/api       [no test files]
ok      k8s.io/dashboard/certificates/ecdsa     0.004s
[common.client] Running tests
?       k8s.io/dashboard/client [no test files]
[common.csrf] Running tests
?       k8s.io/dashboard/csrf   [no test files]
[common.errors] Running tests
ok      k8s.io/dashboard/errors 0.003s
[common.helpers] Running tests
ok      k8s.io/dashboard/helpers        0.005s
[common.types] Running tests
?       k8s.io/dashboard/types  [no test files]

@r-yabyab
Update cosmtrek/air project link to air-verse/air
5d999ae 
Update cosmtrek/air project link to air-verse/air

separate commits
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 10, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 10, 2024
@floreks floreks changed the title Update cosmtrek/air project link to air-verse/air fix: update cosmtrek/air project link to air-verse/air Jun 10, 2024
@floreks floreks added the kind/bug Categorizes issue or PR as related to a bug. label Jun 10, 2024
@codecov Codecov
Copy link

codecov bot commented Jun 10, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.22%. Comparing base (f5bd922) to head (5d999ae).
Report is 1 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #9132   +/-   ##
=======================================
  Coverage   37.22%   37.22%           
=======================================
  Files         255      255           
  Lines       11197    11197           
  Branches      158      142   -16     
=======================================
  Hits         4168     4168           
- Misses       6772     6810   +38     
+ Partials      257      219   -38

@shu-mutou
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 12, 2024
@shu-mutou
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: r-yabyab, shu-mutou

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit b4a2522 into kubernetes:master Jun 12, 2024
17 of 23 checks passed
@r-yabyab r-yabyab deleted the air-verse branch July 8, 2024 18:48
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floreks floreks Awaiting requested review from floreks

@maciaszczykm maciaszczykm Awaiting requested review from maciaszczykm

Assignees

@shu-mutou shu-mutou

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@r-yabyab @shu-mutou @k8s-ci-robot @floreks