-
Notifications
You must be signed in to change notification settings - Fork 1.5k
data: Allow Terraform module bundling via vfsgen #332
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
Changes from all commits
5c536a2
4ca049d
4529399
7ef3e01
2ac5913
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /assets_vfsdata.go |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "assets.go", | ||
| "unpack.go", | ||
| ], | ||
| importpath = "github.com/openshift/installer/data", | ||
| visibility = ["//visibility:public"], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["unpack_test.go"], | ||
| embed = [":go_default_library"], | ||
| ) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // +build !release | ||
| //go:generate go run assets_generate.go | ||
|
|
||
| package data | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "os" | ||
| ) | ||
|
|
||
| // Assets contains project assets. | ||
| var Assets http.FileSystem | ||
|
|
||
| func init() { | ||
| dir := os.Getenv("OPENSHIFT_INSTALL_DATA") | ||
| if dir == "" { | ||
| dir = "data" | ||
| } | ||
| Assets = http.Dir(dir) | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // +build ignore | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "log" | ||
|
|
||
| "github.com/openshift/installer/data" | ||
| "github.com/shurcooL/vfsgen" | ||
| ) | ||
|
|
||
| func main() { | ||
| err := vfsgen.Generate(data.Assets, vfsgen.Options{ | ||
| PackageName: "data", | ||
| BuildTags: "release", | ||
| VariableName: "Assets", | ||
| }) | ||
| if err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,336 @@ | ||
| terraform { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
It could, but anything that doesn't need to be dynamically templated can live in here. I thought we might want to use this approach for some of our manifests and such, as long as they didn't need templating. But I'm fine calling the directory whatever for the short-term, and sorting the rest out later. Thoughts? |
||
| required_version = ">= 0.10.7" | ||
| } | ||
|
|
||
| provider "archive" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "external" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "ignition" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "local" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "null" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "random" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "template" { | ||
| version = "1.0.0" | ||
| } | ||
|
|
||
| provider "tls" { | ||
| version = "1.0.1" | ||
| } | ||
|
|
||
| variable "tectonic_config_version" { | ||
| description = <<EOF | ||
| (internal) This declares the version of the global configuration variables. | ||
| It has no impact on generated assets but declares the version contract of the configuration. | ||
| EOF | ||
|
|
||
| default = "1.0" | ||
| } | ||
|
|
||
| variable "tectonic_image_re" { | ||
| description = <<EOF | ||
| (internal) Regular expression used to extract repo and tag components | ||
| EOF | ||
|
|
||
| type = "string" | ||
| default = "/^([^/]+/[^/]+):(.*)$/" | ||
| } | ||
|
|
||
| variable "tectonic_container_images" { | ||
| description = "(internal) Container images to use" | ||
| type = "map" | ||
|
|
||
| default = { | ||
| addon_resizer = "gcr.io/google_containers/addon-resizer:2.1" | ||
| bootkube = "quay.io/coreos/bootkube:v0.10.0" | ||
| machine_config_operator = "docker.io/openshift/origin-machine-config-operator:v4.0.0" | ||
| etcd_cert_signer = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6" | ||
| etcd = "quay.io/coreos/etcd:v3.2.14" | ||
| hyperkube = "openshift/origin-node:latest" | ||
| kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| kube_core_operator = "quay.io/coreos/kube-core-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| tectonic_alm_operator = "quay.io/coreos/tectonic-alm-operator:v0.3.1" | ||
| tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:3b6952f5a1ba89bb32dd0630faddeaf2779c9a85" | ||
| } | ||
| } | ||
|
|
||
| variable "tectonic_container_base_images" { | ||
| description = "(internal) Base images of the components to use" | ||
| type = "map" | ||
|
|
||
| default = { | ||
| tectonic_monitoring_auth = "quay.io/coreos/tectonic-monitoring-auth" | ||
| config_reload = "quay.io/coreos/configmap-reload" | ||
| addon_resizer = "quay.io/coreos/addon-resizer" | ||
| kube_state_metrics = "quay.io/coreos/kube-state-metrics" | ||
| grafana = "quay.io/coreos/monitoring-grafana" | ||
| grafana_watcher = "quay.io/coreos/grafana-watcher" | ||
| prometheus_operator = "quay.io/coreos/prometheus-operator" | ||
| prometheus_config_reload = "quay.io/coreos/prometheus-config-reloader" | ||
| prometheus = "quay.io/prometheus/prometheus" | ||
| alertmanager = "quay.io/prometheus/alertmanager" | ||
| node_exporter = "quay.io/prometheus/node-exporter" | ||
| kube_rbac_proxy = "quay.io/coreos/kube-rbac-proxy" | ||
| } | ||
| } | ||
|
|
||
| variable "tectonic_versions" { | ||
| description = "(internal) Versions of the components to use" | ||
| type = "map" | ||
|
|
||
| default = { | ||
| tectonic = "1.8.4-tectonic.2" | ||
| alm = "0.4.0" | ||
| } | ||
| } | ||
|
|
||
| variable "tectonic_service_cidr" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| (optional) This declares the IP range to assign Kubernetes service cluster IPs in CIDR notation. | ||
| The maximum size of this IP range is /12 | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_cluster_cidr" { | ||
| type = "string" | ||
|
|
||
| description = "(optional) This declares the IP range to assign Kubernetes pod IPs in CIDR notation." | ||
| } | ||
|
|
||
| variable "tectonic_master_count" { | ||
| type = "string" | ||
| default = "1" | ||
|
|
||
| description = <<EOF | ||
| The number of master nodes to be created. | ||
| This applies only to cloud platforms. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_worker_count" { | ||
| type = "string" | ||
| default = "3" | ||
|
|
||
| description = <<EOF | ||
| The number of worker nodes to be created. | ||
| This applies only to cloud platforms. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_etcd_count" { | ||
| type = "string" | ||
| default = "0" | ||
|
|
||
| description = <<EOF | ||
| The number of etcd nodes to be created. | ||
| If set to zero, the count of etcd nodes will be determined automatically. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_base_domain" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| The base DNS domain of the cluster. It must NOT contain a trailing period. Some | ||
| DNS providers will automatically add this if necessary. | ||
|
|
||
| Example: `openshift.example.com`. | ||
|
|
||
| Note: This field MUST be set manually prior to creating the cluster. | ||
| This applies only to cloud platforms. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_cluster_name" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| The name of the cluster. | ||
| If used in a cloud-environment, this will be prepended to `tectonic_base_domain` resulting in the URL to the Tectonic console. | ||
|
|
||
| Note: This field MUST be set manually prior to creating the cluster. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_pull_secret" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| The pull secret in JSON format. | ||
| This is known to be a "Docker pull secret" as produced by the docker login [1] command. | ||
| A sample JSON content is shown in [2]. | ||
| You can download the pull secret from your Account overview page at [3]. | ||
|
|
||
| [1] https://docs.docker.com/engine/reference/commandline/login/ | ||
|
|
||
| [2] https://coreos.com/os/docs/latest/registry-authentication.html#manual-registry-auth-setup | ||
|
|
||
| [3] https://account.coreos.com/overview | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_update_server" { | ||
| type = "string" | ||
| default = "https://tectonic.update.core-os.net" | ||
| description = "(internal) The URL of the Tectonic Omaha update server" | ||
| } | ||
|
|
||
| variable "tectonic_update_channel" { | ||
| type = "string" | ||
| default = "tectonic-1.9-production" | ||
| description = "(internal) The Tectonic Omaha update channel" | ||
| } | ||
|
|
||
| variable "tectonic_update_app_id" { | ||
| type = "string" | ||
| default = "6bc7b986-4654-4a0f-94b3-84ce6feb1db4" | ||
| description = "(internal) The Tectonic Omaha update App ID" | ||
| } | ||
|
|
||
| variable "tectonic_admin_email" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| (internal) The e-mail address used to: | ||
| 1. login as the admin user to the Tectonic Console. | ||
| 2. generate DNS zones for some providers. | ||
|
|
||
| Note: This field MUST be in all lower-case e-mail address format and set manually prior to creating the cluster. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_admin_password" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| (internal) The admin user password to login to the Tectonic Console. | ||
|
|
||
| Note: This field MUST be set manually prior to creating the cluster. Backslashes and double quotes must | ||
| also be escaped. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_admin_ssh_key" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| (optional) The admin user's SSH public key to login to the nodes. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_ca_cert" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| (optional) The content of the PEM-encoded CA certificate, used to generate all cluster certificates. | ||
| If left blank, a CA certificate will be automatically generated. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_ca_key" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| (optional) The content of the PEM-encoded CA key, used to generate Tectonic all cluster certificates. | ||
| This field is mandatory if `tectonic_ca_cert` is set. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_ca_key_alg" { | ||
| type = "string" | ||
| default = "RSA" | ||
|
|
||
| description = <<EOF | ||
| (optional) The algorithm used to generate tectonic_ca_key. | ||
| The default value is currently recommended. | ||
| This field is mandatory if `tectonic_ca_cert` is set. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_networking" { | ||
| description = <<EOF | ||
| (optional) Configures the network to be used in Tectonic. One of the following values can be used: | ||
|
|
||
| - "flannel": enables overlay networking only. This is implemented by flannel using VXLAN. | ||
|
|
||
| - "canal": enables overlay networking including network policy. Overlay is implemented by flannel using VXLAN. Network policy is implemented by Calico. | ||
|
|
||
| - "calico-ipip": [ALPHA] enables BGP based networking. Routing and network policy is implemented by Calico. Note this has been tested on bare metal installations only. | ||
|
|
||
| - "none": disables the installation of any Pod level networking layer provided by Tectonic. By setting this value, users are expected to deploy their own solution to enable network connectivity for Pods and Services. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_kubelet_debug_config" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = "(internal) debug flags for the kubelet (used in CI only)" | ||
| } | ||
|
|
||
| variable "ignition_masters" { | ||
| type = "list" | ||
| default = [] | ||
|
|
||
| description = <<EOF | ||
| (internal) Ignition config file contents. This is automatically generated by the installer. | ||
| EOF | ||
| } | ||
|
|
||
| variable "ignition_worker" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| (internal) Ignition config file contents. This is automatically generated by the installer. | ||
| EOF | ||
| } | ||
|
|
||
| variable "ignition_bootstrap" { | ||
| type = "string" | ||
| default = "" | ||
|
|
||
| description = <<EOF | ||
| (internal) Ignition config file contents. This is automatically generated by the installer. | ||
| EOF | ||
| } | ||
|
|
||
| variable "tectonic_platform" { | ||
| type = "string" | ||
|
|
||
| description = <<EOF | ||
| (internal) The internal Terraform platform type, e.g. aws or libvirt | ||
| EOF | ||
| } | ||
|
|
||
| // This variable is generated by tectonic internally. Do not modify | ||
| variable "tectonic_cluster_id" { | ||
| type = "string" | ||
| description = "(internal) The Tectonic cluster id." | ||
| } | ||
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.
can we use GOPATH to set reasonable default?
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.
Maybe? But that will break in Go 1.11 when we move to modules and toss out
GOPATH;). Maybe export a default in your~/.bashrcor whatever? Or compile it in?