Skip to content

Commit 7d5200a

Browse files
authored
Merge pull request #15 from stefanprodan/fix-port
Add port validation
2 parents 5142c39 + 66b8948 commit 7d5200a

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

cmd/podinfo/main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"io/ioutil"
1313
"os"
1414
"path/filepath"
15+
"strconv"
1516
"strings"
1617
"time"
1718
)
@@ -82,6 +83,12 @@ func main() {
8283
// start stress tests if any
8384
beginStressTest(viper.GetInt("stress-cpu"), viper.GetInt("stress-memory"), logger)
8485

86+
// validate port
87+
if _, err := strconv.Atoi(viper.GetString("port")); err != nil {
88+
port, _ := fs.GetInt("port")
89+
viper.Set("port", strconv.Itoa(port))
90+
}
91+
8592
// load HTTP server config
8693
var srvCfg api.Config
8794
if err := viper.Unmarshal(&srvCfg); err != nil {
@@ -92,7 +99,7 @@ func main() {
9299
logger.Info("Starting podinfo",
93100
zap.String("version", viper.GetString("version")),
94101
zap.String("revision", viper.GetString("revision")),
95-
zap.String("port", viper.GetString("port")),
102+
zap.String("port", srvCfg.Port),
96103
)
97104

98105
// start HTTP server

deploy/auto-scaling/podinfo-dep.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
---
2-
apiVersion: apps/v1beta1
2+
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: podinfo
66
spec:
7-
replicas: 1
7+
minReadySeconds: 5
8+
progressDeadlineSeconds: 60
9+
strategy:
10+
rollingUpdate:
11+
maxUnavailable: 0
12+
type: RollingUpdate
13+
selector:
14+
matchLabels:
15+
app: podinfo
816
template:
917
metadata:
18+
annotations:
19+
prometheus.io/scrape: "true"
1020
labels:
1121
app: podinfo
12-
#role: openfaas-system
13-
annotations:
14-
prometheus.io/scrape: 'true'
1522
spec:
1623
containers:
1724
- name: podinfod
18-
image: quay.io/stefanprodan/podinfo:1.0.1
25+
image: quay.io/stefanprodan/podinfo:1.4.3
1926
command:
2027
- ./podinfo
2128
- --port=9898

pkg/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package version
22

3-
var VERSION = "1.4.2"
3+
var VERSION = "1.4.3"
44
var REVISION = "unknown"

0 commit comments

Comments
 (0)