Skip to content

* : remove refs to component images & dockerfiles #895

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 2 commits into from
Jul 12, 2019
Merged

* : remove refs to component images & dockerfiles #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52a89ff
remove refs to component images
kikisdeliveryservice Jul 3, 2019
4998ca4
remove component mcc/mcd/mcs/setupetcd dockerfiles
kikisdeliveryservice Jul 11, 2019
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
9 changes: 0 additions & 9 deletions Dockerfile.machine-config-controller
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Dockerfile.machine-config-daemon
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Dockerfile.machine-config-operator
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Dockerfile.machine-config-server
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Dockerfile.setup-etcd-environment
View file
Open in desktop

This file was deleted.

16 changes: 2 additions & 14 deletions cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ var (
infraImage string
kubeCAFile string
kubeClientAgentImage string
mccImage string
mcdImage string
mcsImage string
mcoImage string
networkConfigFile string
oscontentImage string
pullSecretFile string
rootCAFile string
setupEtcdEnvImage string
proxyConfigFile string
}
)
Expand All @@ -52,16 +48,12 @@ func init() {
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.pullSecretFile, "pull-secret", "/assets/manifests/pull.json", "path to secret manifest that contains pull secret.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.destinationDir, "dest-dir", "", "The destination directory where MCO writes the manifests.")
bootstrapCmd.MarkFlagRequired("dest-dir")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mccImage, "machine-config-controller-image", "", "Image for Machine Config Controller.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mcsImage, "machine-config-server-image", "", "Image for Machine Config Server.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mcdImage, "machine-config-daemon-image", "", "Image for Machine Config Daemon.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mcoImage, "machine-config-operator-image", "", "Image for Machine Config Operator.")
bootstrapCmd.MarkFlagRequired("machine-config-operator-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.oscontentImage, "machine-config-oscontent-image", "", "Image for osImageURL")
bootstrapCmd.MarkFlagRequired("machine-config-oscontent-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.etcdImage, "etcd-image", "", "Image for Etcd.")
bootstrapCmd.MarkFlagRequired("etcd-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.setupEtcdEnvImage, "setup-etcd-env-image", "", "Image for Setup etcd Environment.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.kubeClientAgentImage, "kube-client-agent-image", "", "Image for Kube Client Agent.")
bootstrapCmd.MarkFlagRequired("kube-client-agent-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.infraImage, "infra-image", "", "Image for Infra Containers.")
Expand All @@ -83,15 +75,11 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {

imgs := operator.Images{
RenderConfigImages: operator.RenderConfigImages{
MachineConfigOperator: bootstrapOpts.mcoImage,
MachineConfigController: bootstrapOpts.mccImage,
MachineConfigDaemon: bootstrapOpts.mcdImage,
MachineConfigServer: bootstrapOpts.mcsImage,
MachineOSContent: bootstrapOpts.oscontentImage,
MachineConfigOperator: bootstrapOpts.mcoImage,
MachineOSContent: bootstrapOpts.oscontentImage,
},
ControllerConfigImages: operator.ControllerConfigImages{
Etcd: bootstrapOpts.etcdImage,
SetupEtcdEnv: bootstrapOpts.setupEtcdEnvImage,
InfraImage: bootstrapOpts.infraImage,
KubeClientAgent: bootstrapOpts.kubeClientAgentImage,
},
Expand Down
4 changes: 0 additions & 4 deletions install/0000_80_machine-config-operator_02_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ data:
images.json: >
{
"machineConfigOperator": "registry.svc.ci.openshift.org/openshift:machine-config-operator",
"machineConfigController": "registry.svc.ci.openshift.org/openshift:machine-config-controller",
"machineConfigDaemon": "registry.svc.ci.openshift.org/openshift:machine-config-daemon",
"machineConfigServer": "registry.svc.ci.openshift.org/openshift:machine-config-server",
"etcd": "registry.svc.ci.openshift.org/openshift:etcd",
"setupEtcdEnv": "registry.svc.ci.openshift.org/openshift:setup-etcd-environment",
"infraImage": "registry.svc.ci.openshift.org/openshift:pod",
"kubeClientAgentImage": "registry.svc.ci.openshift.org/openshift:kube-client-agent"
}
8 changes: 2 additions & 6 deletions pkg/operator/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@ type Images struct {

// RenderConfigImages are image names used to render templates under ./manifests/
type RenderConfigImages struct {
MachineConfigOperator string `json:"machineConfigOperator"`
MachineConfigController string `json:"machineConfigController"`
MachineConfigDaemon string `json:"machineConfigDaemon"`
MachineConfigServer string `json:"machineConfigServer"`
MachineOSContent string `json:"machineOSContent"`
MachineConfigOperator string `json:"machineConfigOperator"`
MachineOSContent string `json:"machineOSContent"`
}

// ControllerConfigImages are image names used to render templates under ./templates/
type ControllerConfigImages struct {
Etcd string `json:"etcd"`
SetupEtcdEnv string `json:"setupEtcdEnv"`
InfraImage string `json:"infraImage"`
KubeClientAgent string `json:"kubeClientAgentImage"`
}