From e7f4cc121a2f345a520937fe37aa49792c108242 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Sat, 12 Jun 2021 21:55:40 +0000 Subject: [PATCH] games/factorio: move jsonnet from //personal/q3k We also remove the definition of two instances that are long since dead. Change-Id: I0cd83321403053cb72837da1497842109eeacd2b --- .../factorio/kube/factorio.libsonnet | 0 .../q3k => games}/factorio/kube/prod.jsonnet | 39 +++---------------- 2 files changed, 6 insertions(+), 33 deletions(-) rename {personal/q3k => games}/factorio/kube/factorio.libsonnet (100%) rename {personal/q3k => games}/factorio/kube/prod.jsonnet (69%) diff --git a/personal/q3k/factorio/kube/factorio.libsonnet b/games/factorio/kube/factorio.libsonnet similarity index 100% rename from personal/q3k/factorio/kube/factorio.libsonnet rename to games/factorio/kube/factorio.libsonnet diff --git a/personal/q3k/factorio/kube/prod.jsonnet b/games/factorio/kube/prod.jsonnet similarity index 69% rename from personal/q3k/factorio/kube/prod.jsonnet rename to games/factorio/kube/prod.jsonnet index 27dd38d4..d833fc39 100644 --- a/personal/q3k/factorio/kube/prod.jsonnet +++ b/games/factorio/kube/prod.jsonnet @@ -1,10 +1,13 @@ local factorio = import "factorio.libsonnet"; -local kube = import "../../../../kube/kube.libsonnet"; +local kube = import "../../../kube/kube.libsonnet"; - -// Available versions: +// This deploys factorio instances and the modproxy in the `factorio` +// Kubernetes namespace. +// +// Available factorio versions: // - 0.18.40-1 // - 1.0.0-1 +// See: //third_party/factorio. { local prod = self, @@ -81,34 +84,4 @@ local kube = import "../../../../kube/kube.libsonnet"; }, local mod = function(name, version) { name: name, version: version }, - - q3k: prod.instance("q3k", "1.0.0-1") { - cfg+: { - mods: [ - mod("Squeak Through", "1.8.0"), - mod("Bottleneck", "0.11.4"), - ], - }, - }, - pymods: prod.instance("pymods", "1.0.0-1") { - cfg+: { - mods: [ - mod("Bottleneck", "0.11.4"), - mod("FARL", "4.0.2"), - mod("Squeak Through", "1.8.0"), - mod("pycoalprocessing", "1.8.3"), - mod("pycoalprocessinggraphics", "1.0.7"), - mod("pyfusionenergy", "1.6.3"), - mod("pyfusionenergygraphics", "1.0.5"), - mod("pyhightech", "1.6.2"), - mod("pyhightechgraphics", "1.0.8"), - mod("pyindustry", "1.4.7"), - mod("pyrawores", "2.1.5"), - mod("pyraworesgraphics", "1.0.4"), - mod("rso-mod", "6.0.11"), - mod("stdlib", "1.4.3"), - mod("what-is-it-really-used-for", "1.5.13"), - ], - }, - }, }