github/podinfo
1
0
Fork 0
mirror of https://github.com/stefanprodan/podinfo.git synced 2026-08-23 22:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from stefanprodan/release-6.1.2

Browse Source 
Release 6.1.2
This commit is contained in:
Stefan Prodan
2022-04-11 16:35:21 +03:00
committed by GitHub
parent c1fd17e50a 8179263f52
commit 203f7e1bf0
19 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+6 -1
View File
@@ -79,7 +79,7 @@ version-set:
/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/webapp/backend/deployment.yaml && \
/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/frontend/deployment.yaml && \
/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/backend/deployment.yaml && \
/usr/bin/sed -i '' "s/tag:\(\s*\)$$current/tag:\1$$next/g" cue/main.cue && \
/usr/bin/sed -i '' "s/$$current/$$next/g" cue/main.cue && \
echo "Version $$next set in code, deployment, chart and kustomize"
release:
@@ -89,3 +89,8 @@ release:
swagger:
go get github.com/swaggo/swag/cmd/swag
cd pkg/api && $$(go env GOPATH)/bin/swag init -g server.go
.PHONY: cue
cue:
@cd cue && cue fmt ./... && cue vet --all-errors --concrete ./...
@cd cue && cue gen
charts/podinfo/Chart.yaml
+2 -2
View File
@@ -1,6 +1,6 @@
apiVersion: v1
version: 6.1.1
appVersion: 6.1.1
version: 6.1.2
appVersion: 6.1.2
name: podinfo
engine: gotpl
description: Podinfo Helm chart for Kubernetes
charts/podinfo/values-prod.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ backends: []
image:
repository: ghcr.io/stefanprodan/podinfo
tag: 6.1.1
tag: 6.1.2
pullPolicy: IfNotPresent
ui:
charts/podinfo/values.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ backends: []
image:
repository: ghcr.io/stefanprodan/podinfo
tag: 6.1.1
tag: 6.1.2
pullPolicy: IfNotPresent
ui:
cue/cue.mod/module.cue
+1 -1
View File
@@ -1 +1 @@
module: "github.com/stefanprodan/podinfo/cuelang"
module: "github.com/stefanprodan/podinfo/cue"
cue/go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/stefanprodan/podinfo/cuelang
module github.com/stefanprodan/podinfo/cue
go 1.17
cue/main.cue
+9 -5
View File
@@ -1,7 +1,7 @@
package main
import (
podinfo "github.com/stefanprodan/podinfo/cuelang/podinfo"
podinfo "github.com/stefanprodan/podinfo/cue/podinfo"
)
resources: (podinfo.#Application & {
@@ -9,15 +9,19 @@ resources: (podinfo.#Application & {
meta: {
name: "podinfo"
annotations: {
"app.kubernetes.io/name": "podinfo"
"app.kubernetes.io/part-of": "podinfo"
}
}
image: {
repository: "ghcr.io/stefanprodan/podinfo"
tag: "6.0.3"
tag: "6.1.2"
}
service: {
grpcPort: 6666
resources: requests: cpu: "100m"
hpa: {
enabled: true
minReplicas: 2
maxReplicas: 4
cpu: 99
}
}
}).out
cue/podinfo/app.cue
-4
View File
@@ -1,9 +1,5 @@
package podinfo
#selectorLabels: {
"app.kubernetes.io/name": "podinfo"
}
#Application: {
input: #Config
out: {
cue/podinfo/config.cue
+3 -6
View File
@@ -12,6 +12,9 @@ import (
tag: string
pullPolicy: *"IfNotPresent" | string
}
selectorLabels: {
"app.kubernetes.io/name": meta.name
}
replicas: *1 | int
service: #serviceConfig
host: string
@@ -43,12 +46,6 @@ import (
nodeSelector: {[ string]: string}
affinity: corev1.#Affinity
tolerations: [ ...corev1.#Toleration]
linkerd: {
enabled: *false | bool
}
redis: {
enabled: *false | bool
}
tls: {
enabled: *false | bool
port: *9899 | int
cue/podinfo/deployment.cue
+10 -3
View File
@@ -19,13 +19,13 @@ import (
type: "RollingUpdate"
rollingUpdate: maxUnavailable: 1
}
selector: matchLabels: #selectorLabels
selector: matchLabels: _config.selectorLabels
template: {
metadata: {
labels: #selectorLabels
labels: _config.selectorLabels
annotations: {
"prometheus.io/scrape": "true"
"prometheus.io/port": "\(_config.service.httpPort)"
"prometheus.io/port": "\(_config.service.metricsPort)"
_config.podAnnotations
}
}
@@ -41,6 +41,8 @@ import (
command: [
"./podinfo",
"--port=\(_config.service.httpPort)",
"--port-metrics=\(_config.service.metricsPort)",
"--grpc-port=\(_config.service.grpcPort)",
"--level=\(_config.logLevel)",
"--random-delay=\(_config.faults.delay)",
"--random-error=\(_config.faults.error)",
@@ -56,6 +58,11 @@ import (
containerPort: _config.service.metricsPort
protocol: "TCP"
},
{
name: "grpc"
containerPort: _config.service.grpcPort
protocol: "TCP"
},
]
livenessProbe: {
exec: {
cue/podinfo/hpa.cue
+26 -19
View File
@@ -6,8 +6,8 @@ import (
#hpaConfig: {
enabled: *false | bool
cpu: int
memory: string
cpu: *0 | int
memory: *"" | string
minReplicas: int
maxReplicas: int
}
@@ -25,24 +25,31 @@ import (
}
minReplicas: _config.hpa.minReplicas
maxReplicas: _config.hpa.maxReplicas
metrics: [ {
type: "Resource"
resource: {
name: "cpu"
target: {
type: "Utilization"
averageUtilization: _config.hpa.cpu
metrics: [
if _config.hpa.cpu > 0 {
{
type: "Resource"
resource: {
name: "cpu"
target: {
type: "Utilization"
averageUtilization: _config.hpa.cpu
}
}
}
}
}, {
type: "Resource"
resource: {
name: "memory"
target: {
type: "AverageValue"
averageValue: _config.hpa.memory
},
if _config.hpa.memory != "" {
{
type: "Resource"
resource: {
name: "memory"
target: {
type: "AverageValue"
averageValue: _config.hpa.memory
}
}
}
}
}]
},
]
}
}
cue/podinfo/service.cue
+1 -1
View File
@@ -21,7 +21,7 @@ import (
metadata: _config.meta
spec: corev1.#ServiceSpec & {
type: "ClusterIP"
selector: #selectorLabels
selector: _config.selectorLabels
ports: [{
name: "http"
port: _config.service.externalPort
cue/podinfo/servicemonitor.cue
+1 -1
View File
@@ -18,6 +18,6 @@ package podinfo
interval: _config.serviceMonitor.interval
}]
namespaceSelector: matchNames: _config.meta.namespace
selector: matchLabels: #selectorLabels
selector: matchLabels: _config.selectorLabels
}
}
deploy/bases/backend/deployment.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: backend
image: ghcr.io/stefanprodan/podinfo:6.1.1
image: ghcr.io/stefanprodan/podinfo:6.1.2
imagePullPolicy: IfNotPresent
ports:
- name: http
deploy/bases/frontend/deployment.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: frontend
image: ghcr.io/stefanprodan/podinfo:6.1.1
image: ghcr.io/stefanprodan/podinfo:6.1.2
imagePullPolicy: IfNotPresent
ports:
- name: http
deploy/webapp/backend/deployment.yaml
+1 -1
View File
@@ -25,7 +25,7 @@ spec:
serviceAccountName: webapp
containers:
- name: backend
image: ghcr.io/stefanprodan/podinfo:6.1.1
image: ghcr.io/stefanprodan/podinfo:6.1.2
imagePullPolicy: IfNotPresent
ports:
- name: http
deploy/webapp/frontend/deployment.yaml
+1 -1
View File
@@ -25,7 +25,7 @@ spec:
serviceAccountName: webapp
containers:
- name: frontend
image: ghcr.io/stefanprodan/podinfo:6.1.1
image: ghcr.io/stefanprodan/podinfo:6.1.2
imagePullPolicy: IfNotPresent
ports:
- name: http
kustomize/deployment.yaml
+1 -1
View File
@@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: podinfod
image: ghcr.io/stefanprodan/podinfo:6.1.1
image: ghcr.io/stefanprodan/podinfo:6.1.2
imagePullPolicy: IfNotPresent
ports:
- name: http
pkg/version/version.go
+1 -1
View File
@@ -1,4 +1,4 @@
package version
var VERSION = "6.1.1"
var VERSION = "6.1.2"
var REVISION = "unknown"