etcd: Replace yaml dependency github.com/ghodss/yaml with sigs.k8s.io/yaml
#10687
Conversation
|
@rohitsardesai83 |
|
@rohitsardesai83 Can you try if |
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
from
ad3e4f5
to
ea5808a
Compare
Codecov Report
@@ Coverage Diff @@
## master #10687 +/- ##
==========================================
- Coverage 71.62% 71.58% -0.05%
==========================================
Files 394 394
Lines 36659 36659
==========================================
- Hits 26258 26242 -16
- Misses 8569 8577 +8
- Partials 1832 1840 +8
Continue to review full report at Codecov.
|
@jingyih , yes thanks for the help , I did fix the vendor ! |
@neolit123 , thanks for pointing that out ! |
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
from
ea5808a
to
6dc162a
Compare
|
@neolit123 , @jingyih , I have updated bom json , still the CI job is failing : https://travis-ci.com/etcd-io/etcd/jobs/196350107. Earlier semaphoreci passed , but now after i pushed the bom file update , it also failed. |
|
@rohitsardesai83 Error says "vendored licenses do not match given bill of materials". Does |
|
@jingyih, yes I did run script and pushed the updated bom |
|
|
Can you try again? I fetched your changes and rerun updatebom.sh locally. It was able to fix the bom error. |
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
from
6dc162a
to
d236577
Compare
|
@jingyih , the bom is correctly updated . For some reason , another test failed === RUN TestBalancerUnderBlackholeKeepAliveWatch
--- FAIL: TestBalancerUnderBlackholeKeepAliveWatch (5.76s)
black_hole_test.go:83: took too long to receive watch eventsFailing job: https://travis-ci.com/etcd-io/etcd/jobs/196534632 |
Thanks , I guess it was an environment issue, retried with a fresh env and the bom got correctly updated. The bom error is resolved now. |
Thanks @spzala for the info ! |
|
@jingyih , please help in rerunning the tests , the CI build abruptly stopped with some error. |
|
@jingyih , @neolit123 , all checks have passed. Thank you ! |
| "go.etcd.io/etcd/embed" | ||
| "go.etcd.io/etcd/pkg/flags" | ||
| "go.etcd.io/etcd/pkg/types" | ||
| "go.etcd.io/etcd/version" | ||
|
|
||
| "github.com/ghodss/yaml" |
There was a problem hiding this comment.
replace this line with sigs.k8s.io/yaml instead of creating a new import block at line 29
There was a problem hiding this comment.
placed this at the bottom instead of simply replacing the existing ghodss dependency as the 3rd party imports should be sorted alphabetically.
| @@ -36,7 +38,6 @@ import ( | |||
| "go.etcd.io/etcd/pkg/transport" | |||
| "go.etcd.io/etcd/pkg/types" | |||
|
|
|||
| "github.com/ghodss/yaml" | |||
There was a problem hiding this comment.
replace this line with sigs.k8s.io/yaml instead of creating a new import block at line 30
There was a problem hiding this comment.
placed this at the bottom instead of simply replacing the existing ghodss dependency as the 3rd party imports should be sorted alphabetically.
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
3 times, most recently
from
6a8193d
to
e83f311
Compare
|
thanks @xiang90 for your review comments , I have resolved the comments and updated the PR. Please take a look. |
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
from
e83f311
to
9686ec3
Compare
To remove the dependency on ghodss/yaml. Replaced this dependency with sigs.k8s.io/yaml. This wil help to remove the ghodss/yaml dependency from main kubernetes repository. xref: kubernetes/kubernetes#77024
rohitsardesai83
force-pushed
the
replace_ghodss_yaml_with_sigsk8sio_yaml
branch
from
9686ec3
to
42a7ea6
Compare
To remove the dependency on ghodss/yaml. Replaced this dependency with sigs.k8s.io/yaml.
This wil help to remove the ghodss/yaml dependency from main kubernetes repository.
xref: kubernetes/kubernetes#77024.