NE-1269: Replace bindata using embed #905
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| /ingress-operator | ||
| /pkg/manifests/manifests | ||
|
|
||
| tmp/ | ||
| _output/ | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ package manifests | |
|
|
||
| import ( | ||
| "bytes" | ||
| "embed" | ||
| "encoding/base64" | ||
| "fmt" | ||
| "io" | ||
|
|
@@ -74,10 +75,45 @@ const ( | |
| // ClusterIngressConfigName is the name of the cluster Ingress Config | ||
| ClusterIngressConfigName = "cluster" | ||
|
|
||
| // NamespaceManifest is the asset for the operator namespace manifest. | ||
| // This manifest is usually installed by CVO, but it is also used by the | ||
| // "ingress-operator render" command to write out manifests that are | ||
| // required in order to customize ingress at installation time, before | ||
| // CVO installs the manifests. | ||
| NamespaceManifest = "manifests/00-namespace.yaml" | ||
| // CustomResourceDefinitionManifest is the asset for the | ||
| // ingresscontrollers CRD. This manifest is usually installed by CVO, | ||
| // but it is also used by the "ingress-operator render" command to write | ||
| // out manifests that are required in order to customize ingress at | ||
| // installation time, before CVO installs the manifests. | ||
| CustomResourceDefinitionManifest = "manifests/00-custom-resource-definition.yaml" | ||
| ) | ||
|
|
||
| // Copy needed files from the manifests/ directory. This is necessary in order | ||
| // to embed these files here because manifests/ is a top-level directory in the | ||
| // source tree, and go:embed does not allow paths containing "../". | ||
| // | ||
| //go:generate mkdir -p manifests | ||
| //go:generate cp ../../manifests/00-namespace.yaml manifests/ | ||
| //go:generate cp ../../manifests/00-custom-resource-definition.yaml manifests/ | ||
|
|
||
| //go:embed assets manifests | ||
| var content embed.FS | ||
|
|
||
| // MustAsset returns the bytes for the named asset. | ||
| func MustAsset(asset string) []byte { | ||
|
Contributor
There was a problem hiding this comment.
Contributor
There was a problem hiding this comment. Isn't this the https://pkg.go.dev/github.com/abice/go-enum/generator/assets#MustAsset in the
Contributor
Author
There was a problem hiding this comment.
|
||
| b, err := content.ReadFile(asset) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| return b | ||
| } | ||
|
|
||
| // MustAssetString returns a string with the named asset. | ||
| func MustAssetString(asset string) string { | ||
| return string(MustAsset(asset)) | ||
| } | ||
|
|
||
| func MustAssetReader(asset string) io.Reader { | ||
| return bytes.NewReader(MustAsset(asset)) | ||
| } | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of questions. Why are these two files the only ones needed from the manifests/ directory? And why not permanently move them to assets/ instead of creating a temporary directory?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are the only two files that the
ingress-operator rendercommand uses:cluster-ingress-operator/cmd/ingress-operator/render.go
Lines 42 to 45 in e93984f
#309 added the
ingress-operator rendercommand for the installer to use in openshift/installer#2523 for configuring ingresscontrollers at installation time.Then they wouldn't be in the right place for CVO to read them. The manifests still need to be installed by CVO if the cluster admin doesn't configure them with the installer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like a worthwhile comment to add so that somebody doesn't move things in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/openshift/cluster-ingress-operator/compare/62697d237725ec70f45138087875c3e644b901f1..3dafe96f29556f24a6cfdcd199b669681c83221b adds comments.