Skip to content

Make the infra object available for template rendering #943

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Jul 23, 2019
Merged

Make the infra object available for template rendering #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pkg/apis/machineconfiguration.openshift.io/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ type ControllerConfigSpec struct {

// proxy holds the current proxy configuration for the nodes
Proxy *configv1.ProxyStatus `json:"proxy"`

// infra holds the infrastructure details
// TODO this makes platform redundant as everything is contained inside Infra.Status
Infra *configv1.Infrastructure `json:"infra"`
}

// ControllerConfigStatus is the status for ControllerConfig
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/operator/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func createDiscoveredControllerConfigSpec(infra *configv1.Infrastructure, networ
CloudProviderConfig: "",
EtcdDiscoveryDomain: infra.Status.EtcdDiscoveryDomain,
Platform: platform,
Infra: infra,
}

if proxy != nil {
Expand Down