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.

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

Fix statik directory structure #5250

Merged
merged 2 commits into from
Jan 21, 2021

Conversation

IsaacPD
Copy link
Contributor

@IsaacPD IsaacPD commented Jan 20, 2021

Fixes: #5253

Description
For some reason the way that I had generated the statik file in #5157 for the metrics credentials conflicted with the existing method that creats the statik file structure. This resulted in calls to skaffold schema get and skaffold credits returning file not found if running skaffold built from master with all the licenses and etc. being built in.

In order to fix this I followed similarly to the previous statik generation and moved it into the temp directory that ultimately gets exported to cmd/skaffold/app/cmd/statik/statik.go

Fortunately this bug has not made it into a release so we can fix this and hopefully no one will notice 😅. If not fixed this would also ultimately affect the build release script since it relies on skaffold credits

RUN skaffold credits -d /THIRD_PARTY_NOTICES

User facing changes
skaffold credits and skaffold schema get work

@IsaacPD IsaacPD requested a review from a team as a code owner January 20, 2021 16:54
@google-cla google-cla bot added the cla: yes label Jan 20, 2021
@codecov
Copy link

codecov bot commented Jan 20, 2021

Codecov Report

Merging #5250 (de37445) into master (9be575b) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5250      +/-   ##
==========================================
+ Coverage   71.87%   71.90%   +0.02%     
==========================================
  Files         388      388              
  Lines       14043    14043              
==========================================
+ Hits        10094    10098       +4     
+ Misses       3205     3203       -2     
+ Partials      744      742       -2     
Impacted Files Coverage Δ
pkg/skaffold/instrumentation/meter.go 71.22% <100.00%> (ø)
pkg/skaffold/util/tar.go 56.00% <0.00%> (+5.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9be575b...de37445. Read the comment docs.

@IsaacPD IsaacPD force-pushed the fix-statik-directories branch from 3816cd7 to de37445 Compare January 20, 2021 21:03
Copy link
Contributor

@MarlonGamez MarlonGamez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tried locally, seems to be working as intended :)

@IsaacPD IsaacPD merged commit 657345b into GoogleContainerTools:master Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

skaffold schema get and skaffold credits don't work when secret credentials exist
2 participants