From 05824a5fd5f0832929f24af714ff321af02dc96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikl=C3=B3s=20T=C3=B3th?= <tothmiklostibor@gmail.com>
Date: Mon, 4 Oct 2021 12:56:33 +0200
Subject: [PATCH] fix order
---
.gitlab-ci.yml | 2 +-
data/data.go | 12 ++++--------
k8s/values.yaml | 2 +-
stations.yaml | 8 ++++++++
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3b3be3..c68f083 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
image: alpine
variables:
- VERSION: v2.6
+ VERSION: v2.7
stages:
- build
diff --git a/data/data.go b/data/data.go
index 81c5fd2..e67ab01 100644
--- a/data/data.go
+++ b/data/data.go
@@ -18,9 +18,11 @@ type Station struct {
type File struct {
Stations map[string]*Station
Stories map[int]string
+ Order []string
}
var Stations map[string]*Station
+var Order []string
func ReadFile() {
b, err := ioutil.ReadFile("stations.yaml")
@@ -35,6 +37,7 @@ func ReadFile() {
}
Stations = file.Stations
+ Order = file.Order
for key, value := range Stations {
value.Id = key
@@ -42,12 +45,5 @@ func ReadFile() {
}
func CreateNewRoute() []string {
- stationIds := make([]string, len(Stations))
- i := 0
- for k := range Stations {
- stationIds[i] = k
- i++
- }
-
- return stationIds
+ return Order
}
diff --git a/k8s/values.yaml b/k8s/values.yaml
index 076845f..4d237bc 100644
--- a/k8s/values.yaml
+++ b/k8s/values.yaml
@@ -2,5 +2,5 @@ replicas: 1
Domain: keresettaferi.kszk.bme.hu
Name: keresettaferi
-Tag: "v2.6"
+Tag: "v2.7"
REGISTRY_CONF: "${REGISTRY_CONF}"
diff --git a/stations.yaml b/stations.yaml
index 809a619..cbc86a9 100644
--- a/stations.yaml
+++ b/stations.yaml
@@ -21,4 +21,12 @@ stations:
name: uccso
story: "07.html"
+order:
+ - first
+ - 9881300f-175b-4809-b8fb-d915b2c900ac
+ - 2ab06fbd-0606-42a9-abc7-4163221d3f1f
+ - 7023030f-e22f-4c82-93ae-4c847b3ac964
+ - 12907d55-a0c0-4256-bb60-017d603ce403
+ - f0495cfa-5667-4853-ba69-febfde57fdc2
+ - last
--
GitLab