Skip to content
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

Jump to bottom

Remove submodules #423

Closed
wants to merge 4 commits into from
Closed

Remove submodules #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdec20f
Remove fedora-coreos submodule
vrutkovs Sep 2, 2022
c619576
Remove openshift-os
vrutkovs Sep 2, 2022
f55ed66
Remove dependabot config
vrutkovs Sep 2, 2022
a34a807
overlay: remove NM mac config
vrutkovs Sep 3, 2022
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
6 changes: 0 additions & 6 deletions .github/dependabot.yaml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .gitmodules
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM registry.ci.openshift.org/origin/4.12:artifacts as artifacts
FROM registry.ci.openshift.org/origin/4.12:machine-config-operator as mcd
FROM registry.ci.openshift.org/origin/4.12:rhel-coreos-8 as rhcos
Copy link
Member

Choose a reason for hiding this comment

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

we can't do this unfortunately if we want any kind of reproducibility out side of builds that have access to ocp - rhel-coreos-8 isn't going to be mirrored to origin going forward.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, snap, we might want to have src version of os then (present in the imagestream, but not included in the payload)

Copy link
Member

Choose a reason for hiding this comment

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

that would be nice indeed. I think for now, let's just remove the fcos config, and continue with the os submodule?

Copy link
Member Author

Choose a reason for hiding this comment

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

lets wait for openshift/release#31973 to merge and I'll update this PR.


FROM registry.access.redhat.com/ubi8/ubi-minimal as rpms
WORKDIR /rpms
Expand All @@ -13,8 +14,10 @@ COPY . /go/src/github.com/openshift/okd-machine-os
WORKDIR /go/src/github.com/openshift/okd-machine-os
COPY --from=rpms /rpms/ /tmp/rpms
COPY --from=rpms /binaries/machine-config-daemon /usr/libexec/machine-config-daemon
COPY overlay.d/ /tmp/overlay
RUN cp -irvf /tmp/overlay/*/* / \
COPY --from=rhcos /usr/lib/systemd/system/gcp-routes.service /usr/lib/systemd/system/gcp-routes.service
COPY --from=rhcos /usr/lib/systemd/system-preset/44-gcp-routes.preset /usr/lib/systemd/system-preset/44-gcp-routes.preset
COPY --from=rhcos /usr/sbin/gcp-routes.sh /usr/sbin/gcp-routes.sh
RUN cp -irvf overlay.d/99okd/* / \
&& cp -irvf bootstrap / \
&& cp -irvf manifests / \
&& rpm-ostree install \
Expand Down
1 change: 0 additions & 1 deletion fedora-coreos-config
Open in desktop
Submodule fedora-coreos-config deleted from 712ed1
1 change: 0 additions & 1 deletion openshift-os
Open in desktop
Submodule openshift-os deleted from 38fd41
1 change: 0 additions & 1 deletion overlay.d/06gcp-routes
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions overlay.d/99okd/usr/lib/NetworkManager/conf.d/20-dhcp-client-id-mac.conf
View file
Open in desktop

This file was deleted.