project-lakitu: cleanup stackdriver services
After removing stackdriver-monitoring, we nolonger require
the stackdrvier-metadata services and stackdriver-docker-network
BUG=b/183105423
TEST=presubmit and manual verification
RELEASE_NOTE=None
Change-Id: Ia51862c280919794dc3c7317e84985c54e187154
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/14530
Reviewed-by: Roy Yang <royyang@google.com>
Reviewed-by: Sam Kunz <samkunz@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-admin/stackdriver/files/env_vars b/project-lakitu/app-admin/stackdriver/files/env_vars
index 158f61b..8756a6b 100644
--- a/project-lakitu/app-admin/stackdriver/files/env_vars
+++ b/project-lakitu/app-admin/stackdriver/files/env_vars
@@ -2,10 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-NETWORK_NAME="stackdriver-agents-network"
-
-METADATA_AGENT_DOCKER_IMAGE="gcr.io/stackdriver-agents/stackdriver-metadata-agent:0.2-0.0.17-2"
-METADATA_AGENT_NAME="stackdriver-metadata-agent"
LOGGING_AGENT_DOCKER_IMAGE="gcr.io/stackdriver-agents/stackdriver-logging-agent:1.8.4"
LOGGING_AGENT_NAME="stackdriver-logging-agent"
diff --git a/project-lakitu/app-admin/stackdriver/files/stackdriver-docker-network.service b/project-lakitu/app-admin/stackdriver/files/stackdriver-docker-network.service
deleted file mode 100644
index fd17b84..0000000
--- a/project-lakitu/app-admin/stackdriver/files/stackdriver-docker-network.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Stackdriver Docker Network
-After=docker.socket
-Wants=docker.socket
-StopWhenUnneeded=true
-
-[Service]
-EnvironmentFile=-/etc/stackdriver/env_vars
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c "if ! /usr/bin/docker network inspect ${NETWORK_NAME}; then /usr/bin/docker network create --driver=bridge ${NETWORK_NAME}; fi"
-ExecStop=/usr/bin/docker network rm "${NETWORK_NAME}"
diff --git a/project-lakitu/app-admin/stackdriver/files/stackdriver-metadata.service b/project-lakitu/app-admin/stackdriver/files/stackdriver-metadata.service
deleted file mode 100644
index 53e0ec8..0000000
--- a/project-lakitu/app-admin/stackdriver/files/stackdriver-metadata.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Stackdriver Metadata Agent
-After=gcr-online.target stackdriver-docker-network.service
-Wants=gcr-online.target
-Requires=stackdriver-docker-network.service
-StopWhenUnneeded=true
-
-[Service]
-EnvironmentFile=-/etc/stackdriver/env_vars
-ExecStart=/usr/bin/docker run \
- --rm --network="${NETWORK_NAME}" \
- --name="${METADATA_AGENT_NAME}" \
- --volume=/var/run/docker.sock:/var/run/docker.sock \
- "${METADATA_AGENT_DOCKER_IMAGE}"
-Restart=on-failure
-RestartSec=5
-ExecStop=/usr/bin/docker stop "${METADATA_AGENT_NAME}"
diff --git a/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1-r23.ebuild b/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1-r24.ebuild
similarity index 100%
rename from project-lakitu/app-admin/stackdriver/stackdriver-0.0.1-r23.ebuild
rename to project-lakitu/app-admin/stackdriver/stackdriver-0.0.1-r24.ebuild
diff --git a/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1.ebuild b/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1.ebuild
index da22ba2..e75f4b9 100644
--- a/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1.ebuild
+++ b/project-lakitu/app-admin/stackdriver/stackdriver-0.0.1.ebuild
@@ -32,7 +32,5 @@
doins "${FILESDIR}"/env_vars
systemd_dounit "${FILESDIR}"/docker-events-collector.service
- systemd_dounit "${FILESDIR}"/stackdriver-docker-network.service
- systemd_dounit "${FILESDIR}"/stackdriver-metadata.service
systemd_dounit "${FILESDIR}"/stackdriver-logging.service
}
