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
4 changes: 2 additions & 2 deletions Gopkg.lock

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

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: clusterapi-manager-controllers
name: machine-api-controllers
namespace: {{ .TargetNamespace }}
labels:
api: clusterapi
Expand Down Expand Up @@ -39,7 +39,7 @@ spec:
- name: controller-manager
image: {{ .Controllers.Provider }}
command:
- "./manager"
- /manager
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, to align with all other command and other fields syntax

args:
- --logtostderr=true
- --v=3
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
requests:
cpu: 10m
memory: 20Mi
- name: machine-healthcheck
- name: machine-healthcheck-controller
image: {{ .Controllers.MachineHealthCheck }}
command:
- /machine-healthcheck
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (optr *Operator) syncAll(config OperatorConfig) error {
}

func (optr *Operator) syncClusterAPIController(config OperatorConfig) error {
controllerBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "clusterapi-manager-controllers.yaml"))
controllerBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "machine-api-controllers.yaml"))
if err != nil {
return err
}
Expand Down

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

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