*: bump docker images and storage pools
This brings all core services back to life after The Failure.
Change-Id: I98b0c104c66fa11f646864018356e9c3a226a1f9
diff --git a/WORKSPACE b/WORKSPACE
index 4b246c7..99e7b31 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -89,7 +89,7 @@
registry = "registry.k0.hswaw.net",
repository = "q3k/prodimage",
tag = "20190725-1806",
- digest = "sha256:169ca347eb5daa140dd61a9af71db5efe2abd7ac618cfd162375481cd91d5db8",
+ digest = "sha256:b3ad5f62813e2d88ce8cc4f2c9c8e260a3d0e517eda428275ee7976bdd8d6475",
)
container_pull(
diff --git a/bgpwtf/cccampix/kube/ix.libsonnet b/bgpwtf/cccampix/kube/ix.libsonnet
index def1d79..ec89291 100644
--- a/bgpwtf/cccampix/kube/ix.libsonnet
+++ b/bgpwtf/cccampix/kube/ix.libsonnet
@@ -6,8 +6,8 @@
local cfg = ix.cfg,
cfg:: {
octorpki: {
- image: "registry.k0.hswaw.net/q3k/octorpki:1564072856-3bfb2ef7fd180e774f74bbc9eebf6d97b9d80003",
- storageClassName: "waw-hdd-redundant-1",
+ image: "registry.k0.hswaw.net/q3k/octorpki:1565367301-909a166cac3bdade6d5b8344fa590aa884114911",
+ storageClassName: "waw-hdd-redundant-2",
resources: {
requests: { cpu: "100m", memory: "500Mi" },
limits: { cpu: "500m", memory: "1Gi" },
diff --git a/devtools/bazel-cache/prod.jsonnet b/devtools/bazel-cache/prod.jsonnet
index b4a9b6e..6ed1234 100644
--- a/devtools/bazel-cache/prod.jsonnet
+++ b/devtools/bazel-cache/prod.jsonnet
@@ -10,7 +10,7 @@
cfg:: {
namespace: "bazel-cache",
domain: "k0.hswaw.net",
- storageClassName: "waw-hdd-yolo-1",
+ storageClassName: "waw-hdd-yolo-2",
},
metadata(component):: {
diff --git a/personal/q3k/factorio/BUILD b/personal/q3k/factorio/BUILD
index 44be4dd..d73d6de 100644
--- a/personal/q3k/factorio/BUILD
+++ b/personal/q3k/factorio/BUILD
@@ -1,4 +1,5 @@
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_push")
container_image(
name="0.16.51-1",
@@ -27,26 +28,11 @@
entrypoint = ["/entrypoint.sh"],
)
-# Totally broken right now because google/containerregistry doesn't handle
-# /usr/bin/env python == python3.
-#container_push(
-# name = "push_latest",
-# image = ":latest",
-# format = "Docker",
-# registry = "registry.k0.hswaw.net",
-# repository = "app/factorio",
-# tag = "latest",
-#)
-# So this is a replacement hack.
-genrule(
+container_push(
name = "push_latest",
- srcs = [":0.17.52-1"],
- outs = ["version.sh"],
- executable = True,
- cmd = """
- tag=0.17.52-1
- docker tag bazel/personal/q3k/factorio:$$tag registry.k0.hswaw.net/personal/q3k/factorio:$$tag
- docker push registry.k0.hswaw.net/personal/q3k/factorio:$$tag
- echo -ne "#!/bin/sh\necho Pushed $$tag.\n" > $(OUTS)
- """,
+ image = ":0.17.52-1",
+ format = "Docker",
+ registry = "registry.k0.hswaw.net",
+ repository = "app/factorio",
+ tag = "0.17.52-1",
)
diff --git a/personal/q3k/factorio/kube/factorio.libsonnet b/personal/q3k/factorio/kube/factorio.libsonnet
index 497c62a..c89d6d5 100644
--- a/personal/q3k/factorio/kube/factorio.libsonnet
+++ b/personal/q3k/factorio/kube/factorio.libsonnet
@@ -9,7 +9,7 @@
cfg:: {
namespace: error "namespace must be set",
appName: "factorio",
- storageClassName: "waw-hdd-redundant-1",
+ storageClassName: "waw-hdd-redundant-2",
prefix: "", # if set, should be 'foo-'
rconPort: 2137,