Skip to content

install: Fix reference to pod image #508

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
Mar 1, 2019
Merged

install: Fix reference to pod image #508

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
2 changes: 1 addition & 1 deletion cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
MachineOSContent: bootstrapOpts.oscontentImage,
Etcd: bootstrapOpts.etcdImage,
SetupEtcdEnv: bootstrapOpts.setupEtcdEnvImage,
InfraImage: bootstrapOpts.infraImage,
InfraImage: "quay.io/openshift/origin-pod:v4.0",
}

if err := operator.RenderBootstrap(
Expand Down
1 change: 1 addition & 0 deletions install/0000_30_machine-config-operator_02_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ data:
"machineConfigServer": "docker.io/openshift/origin-machine-config-server:v4.0.0",
"etcd": "quay.io/coreos/etcd:v3.3.10",
"setupEtcdEnv": "registry.svc.ci.openshift.org/openshift/origin-v4.0:setup-etcd-environment",
"dummyImage": "quay.io/tectonicshift/pod:42",
"infraImage": "quay.io/openshift/origin-pod:v4.0"
}
2 changes: 1 addition & 1 deletion install/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- name: pod
from:
kind: DockerImage
name: quay.io/openshift/pod:v4.0
name: quay.io/tectonicshift/pod:42
Copy link
Member

@derekwaynecarr derekwaynecarr Mar 1, 2019

Choose a reason for hiding this comment

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

what is this image?

we need to use the pod image from the release payload.

Copy link
Member Author

@cgwalters cgwalters Mar 1, 2019

Choose a reason for hiding this comment

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

This image doesn't exist and we aren't actually using it - we're really using the openshift/pod:v4.0 image still. The reason to add this new dummy image is to help "ratchet" the change here so we can land the installer PR.

Yes, it is very confusing...

Copy link
Member Author

@cgwalters cgwalters Mar 1, 2019

Choose a reason for hiding this comment

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

See #471 (comment)

- name: setup-etcd-environment
from:
kind: DockerImage
Expand Down