Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions cmd/openshift-install/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
)

var (
installConfigCommand = kingpin.Command("install-config", "Generate the Install Config asset")
installConfigCommand = kingpin.Command("install-config", "Generate the Install Config asset")
ignitionConfigsCommand = kingpin.Command("ignition-configs", "Generate the Ignition Config assets")

dirFlag = kingpin.Flag("dir", "assets directory").Default(".").String()
logLevel = kingpin.Flag("log-level", "log level (e.g. \"debug\")").Default("info").Enum("debug", "info", "warn", "error", "fatal", "panic")
Expand All @@ -22,11 +23,16 @@ func main() {

assetStock := stock.EstablishStock(*dirFlag)

var targetAsset asset.Asset

var targetAssets []asset.Asset
switch command {
case installConfigCommand.FullCommand():
targetAsset = assetStock.InstallConfig()
targetAssets = []asset.Asset{assetStock.InstallConfig()}
case ignitionConfigsCommand.FullCommand():
targetAssets = []asset.Asset{
assetStock.BootstrapIgnition(),
assetStock.MasterIgnition(),
assetStock.WorkerIgnition(),
}
}

l, err := log.ParseLevel(*logLevel)
Expand All @@ -37,14 +43,16 @@ func main() {
log.SetLevel(l)

assetStore := &asset.StoreImpl{}
st, err := assetStore.Fetch(targetAsset)
if err != nil {
log.Fatalf("failed to generate asset: %v", err)
os.Exit(1)
}

if err := st.PersistToFile(); err != nil {
log.Fatalf("failed to write target to disk: %v", err)
os.Exit(1)
for _, asset := range targetAssets {
st, err := assetStore.Fetch(asset)
if err != nil {
log.Fatalf("failed to generate asset: %v", err)
os.Exit(1)
}

if err := st.PersistToFile(); err != nil {
log.Fatalf("failed to write target to disk: %v", err)
os.Exit(1)
}
}
}
2 changes: 1 addition & 1 deletion installer/pkg/config-generator/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ go_library(
importpath = "github.com/openshift/installer/installer/pkg/config-generator",
visibility = ["//visibility:public"],
deps = [
"//pkg/rhcos:go_default_library",
"//installer/pkg/config:go_default_library",
"//installer/pkg/copy:go_default_library",
"//pkg/asset/tls:go_default_library",
"//pkg/ipnet:go_default_library",
"//pkg/rhcos:go_default_library",
"//pkg/types:go_default_library",
"//vendor/github.com/apparentlymart/go-cidr/cidr:go_default_library",
"//vendor/github.com/coreos/ignition/config/v2_2:go_default_library",
Expand Down
44 changes: 44 additions & 0 deletions pkg/asset/ignition/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")

go_library(
name = "go_default_library",
srcs = [
"bootstrap.go",
"doc.go",
"master.go",
"node.go",
"stock.go",
"worker.go",
],
importpath = "github.com/openshift/installer/pkg/asset/ignition",
visibility = ["//visibility:public"],
deps = [
"//pkg/asset:go_default_library",
"//pkg/asset/ignition/templates:go_default_library",
"//pkg/asset/installconfig:go_default_library",
"//pkg/asset/kubeconfig:go_default_library",
"//pkg/asset/tls:go_default_library",
"//pkg/types:go_default_library",
"//vendor/github.com/coreos/ignition/config/util:go_default_library",
"//vendor/github.com/coreos/ignition/config/v2_2/types:go_default_library",
"//vendor/github.com/vincent-petithory/dataurl:go_default_library",
],
)

go_test(
name = "go_default_test",
srcs = [
"bootstrap_test.go",
"master_test.go",
"testasset_test.go",
"testutils_test.go",
"worker_test.go",
],
embed = [":go_default_library"],
deps = [
"//pkg/asset:go_default_library",
"//pkg/asset/ignition/templates:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/vincent-petithory/dataurl:go_default_library",
],
)
Loading