asset/ignition: clean up templates #259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
size/M
|
/retest |
|
This looks good to me, but as of 8936aa8, Bazel suggests some changes: $ bazel run //:gazelle
$ git diff
diff --git a/pkg/asset/ignition/BUILD.bazel b/pkg/asset/ignition/BUILD.bazel
index d369141..778b4ed 100644
--- a/pkg/asset/ignition/BUILD.bazel
+++ b/pkg/asset/ignition/BUILD.bazel
@@ -14,7 +14,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/asset:go_default_library",
- "//pkg/asset/ignition/templates:go_default_library",
+ "//pkg/asset/ignition/content:go_default_library",
"//pkg/asset/installconfig:go_default_library",
"//pkg/asset/kubeconfig:go_default_library",
"//pkg/asset/tls:go_default_library",
@@ -37,7 +37,7 @@ go_test(
embed = [":go_default_library"],
deps = [
"//pkg/asset:go_default_library",
- "//pkg/asset/ignition/templates:go_default_library",
+ "//pkg/asset/ignition/content:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/vincent-petithory/dataurl:go_default_library",
],
diff --git a/pkg/asset/ignition/content/BUILD.bazel b/pkg/asset/ignition/content/BUILD.bazel
index eec25a1..7fd8c13 100644
--- a/pkg/asset/ignition/content/BUILD.bazel
+++ b/pkg/asset/ignition/content/BUILD.bazel
@@ -8,6 +8,6 @@ go_library(
"kubelet.go",
"tectonic.go",
],
- importpath = "github.com/openshift/installer/pkg/asset/ignition/templates",
+ importpath = "github.com/openshift/installer/pkg/asset/ignition/content",
visibility = ["//visibility:public"],
) |
|
Crap. Forgot to run gazelle. |
This now distinguishes between constant strings and templates, which will make it less likely that a template isn't executed when it should be. This also has the advantage that the binary will panic immediately if any of the templates are invalid.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: crawford, wking 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 |
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This now distinguishes between constant strings and templates, which
will make it less likely that a template isn't executed when it should
be. This also has the advantage that the binary will panic immediately
if any of the templates are invalid.