Skip to content

Commit

Permalink
Drop fedora-coreos-pinger
Browse files Browse the repository at this point in the history
It's a stub service that only parses a config file, and we never
adequately documented the config file.  We have no current plans to
finish implementing the service, so let's drop it.

Fixes coreos/fedora-coreos-tracker#770.
  • Loading branch information
bgilbert committed Jun 22, 2022
1 parent c048af0 commit 0b03cef
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 17 deletions.
1 change: 0 additions & 1 deletion ci/overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
'rust-afterburn',
'rust-bootupd',
'rust-coreos-installer',
'rust-fedora-coreos-pinger',
'rust-ignition-config',
'rust-zincati',
]
Expand Down
2 changes: 0 additions & 2 deletions manifests/disable-zincati-and-pinger.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions manifests/disable-zincati.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ostree-layers:
- overlay/16disable-zincati
9 changes: 3 additions & 6 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include: fedora-coreos-base.yaml
conditional-include:
- if: prod == false
# long-term, would be good to support specifying a nested TreeComposeConfig
include: disable-zincati-and-pinger.yaml
include: disable-zincati.yaml
- if: basearch == "aarch64"
# Fixup for kdump on aarch64 AWS instances
include: kdump-aarch64-aws-workaround.yaml
Expand Down Expand Up @@ -47,8 +47,6 @@ packages:
- moby-engine
# Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
- containerd
# User metrics
- fedora-coreos-pinger
# Updates
- zincati
# Include and set the default editor
Expand All @@ -64,15 +62,14 @@ etc-group-members:
# ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
# See also the version of this in fedora-coreos-base.yaml
postprocess:
# Disable Zincati and fedora-coreos-pinger on non-release builds
# Disable Zincati on non-release builds
# https://github.com/coreos/fedora-coreos-tracker/issues/212
- |
#!/usr/bin/env bash
set -xeuo pipefail
source /etc/os-release
if [[ $OSTREE_VERSION = *.dev* ]]; then
mkdir -p /etc/fedora-coreos-pinger/config.d /etc/zincati/config.d
echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nreporting.enabled = false' > /etc/fedora-coreos-pinger/config.d/95-disable-on-dev.toml
mkdir -p /etc/zincati/config.d
echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nupdates.enabled = false' > /etc/zincati/config.d/95-disable-on-dev.toml
fi
# Users shouldn't be configuring `rpm-ostreed.conf`
Expand Down
2 changes: 0 additions & 2 deletions overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# User metrics client
enable fedora-coreos-pinger.service
enable coreos-check-ssh-keys.service
# Check if cgroupsv1 is still being used
enable coreos-check-cgroups.service

This file was deleted.

8 changes: 4 additions & 4 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ Things that are more closely "Fedora CoreOS":
* disable password logins by default over SSH
* enable SSH keys written by Ignition and Afterburn
* branding (MOTD)
* enable services by default (fedora-coreos-pinger)
* enable FCOS-specific services by default
* display warnings on the console if no ignition config was provided or no ssh
key found.

16disable-zincati-and-pinger
------------------------
16disable-zincati
-----------------

Disable Zincati and fedora-coreos-pinger on non-production streams:
Disable Zincati on non-production streams:
https://github.com/coreos/fedora-coreos-tracker/issues/163

20platform-chrony
Expand Down

0 comments on commit 0b03cef

Please sign in to comment.