From 8a6a4e890136e474cbf2be1886257ecf985b0457 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Thu, 16 Aug 2018 00:09:02 +0300 Subject: [PATCH] Release v0.6 - Helm chart: use quay image, add color env var, rename backend env var, adjust deployment strategy and set liveness probe to 2s --- charts/podinfo/Chart.yaml | 4 +-- charts/podinfo/templates/deployment.yaml | 27 ++++++++++++++---- charts/podinfo/values.yaml | 11 ++++---- deploy/istio/backend-grey-dep.yaml | 4 +-- deploy/istio/backend-orange-dep.yaml | 4 +-- deploy/istio/blue-dep.yaml | 4 +-- deploy/istio/green-dep.yaml | 4 +-- deploy/istio/store-dep.yaml | 2 +- deploy/skaffold/test/deployment.yaml | 20 +++++++++++-- deploy/skaffold/test/service.yaml | 2 +- docs/index.yaml | 34 +++++++++++++++++------ docs/podinfo-0.2.2.tgz | Bin 0 -> 4422 bytes pkg/version/version.go | 2 +- 13 files changed, 82 insertions(+), 36 deletions(-) create mode 100644 docs/podinfo-0.2.2.tgz diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml index 26ac637..7424509 100644 --- a/charts/podinfo/Chart.yaml +++ b/charts/podinfo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "0.5.1" +appVersion: "0.6.0" description: Podinfo Helm chart for Kubernetes name: podinfo -version: 0.2.1 +version: 0.2.2 home: https://github.com/stefanprodan/k8s-podinfo sources: - https://github.com/stefanprodan/k8s-podinfo diff --git a/charts/podinfo/templates/deployment.yaml b/charts/podinfo/templates/deployment.yaml index 6c1eef9..d47aaf0 100644 --- a/charts/podinfo/templates/deployment.yaml +++ b/charts/podinfo/templates/deployment.yaml @@ -9,6 +9,10 @@ metadata: heritage: {{ .Release.Service }} spec: replicas: {{ .Values.replicaCount }} + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 selector: matchLabels: app: {{ template "podinfo.name" . }} @@ -21,6 +25,7 @@ spec: annotations: prometheus.io/scrape: 'true' spec: + terminationGracePeriodSeconds: 30 containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -30,20 +35,30 @@ spec: - -port={{ .Values.service.containerPort }} - -logLevel={{ .Values.logLevel }} env: - - name: backend_url + - name: color + value: {{ .Values.color }} + {{- if .Values.backend }} + - name: backendURL value: {{ .Values.backend }} + {{- end }} ports: - name: http containerPort: {{ .Values.service.containerPort }} protocol: TCP - livenessProbe: - httpGet: - path: /healthz - port: http readinessProbe: httpGet: path: /readyz - port: http + port: 9898 + initialDelaySeconds: 1 + periodSeconds: 2 + failureThreshold: 1 + livenessProbe: + httpGet: + path: /healthz + port: 9898 + initialDelaySeconds: 1 + periodSeconds: 10 + failureThreshold: 2 volumeMounts: - name: data mountPath: /data diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 18edc35..b9404d9 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -1,11 +1,12 @@ # Default values for podinfo. -replicaCount: 1 -backend: http://backend-podinfo:9898/echo +replicaCount: 2 +color: blue +backend: #http://backend-podinfo:9898/echo image: - repository: stefanprodan/podinfo - tag: 0.5.1 + repository: quay.io/stefanprodan/podinfo + tag: 0.6.0 pullPolicy: IfNotPresent service: @@ -50,4 +51,4 @@ tolerations: [] affinity: {} -logLevel: debug +logLevel: info diff --git a/deploy/istio/backend-grey-dep.yaml b/deploy/istio/backend-grey-dep.yaml index 32638ab..ca91651 100644 --- a/deploy/istio/backend-grey-dep.yaml +++ b/deploy/istio/backend-grey-dep.yaml @@ -27,7 +27,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-rc.10 + image: quay.io/stefanprodan/podinfo:0.6.0 lifecycle: preStop: exec: @@ -60,5 +60,5 @@ spec: value: "grey" - name: message value: "Greetings from backend grey" - - name: backend_url + - name: backendURL value: "http://podinfo-store:9898/echo" #"https://httpbin.org/anything" diff --git a/deploy/istio/backend-orange-dep.yaml b/deploy/istio/backend-orange-dep.yaml index c7a71de..1a4335b 100644 --- a/deploy/istio/backend-orange-dep.yaml +++ b/deploy/istio/backend-orange-dep.yaml @@ -27,7 +27,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-rc.10 + image: quay.io/stefanprodan/podinfo:0.6.0 lifecycle: preStop: exec: @@ -60,5 +60,5 @@ spec: value: "orange" - name: message value: "Greetings from backend orange" - - name: backend_url + - name: backendURL value: "http://podinfo-store:9898/echo" #"https://httpbin.org/anything" diff --git a/deploy/istio/blue-dep.yaml b/deploy/istio/blue-dep.yaml index da770a4..1689507 100644 --- a/deploy/istio/blue-dep.yaml +++ b/deploy/istio/blue-dep.yaml @@ -27,7 +27,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-rc.10 + image: quay.io/stefanprodan/podinfo:0.6.0 lifecycle: preStop: exec: @@ -61,5 +61,5 @@ spec: value: "blue" - name: message value: "Greetings from podinfo blue" - - name: backend_url + - name: backendURL value: "http://podinfo-backend:9898/backend" diff --git a/deploy/istio/green-dep.yaml b/deploy/istio/green-dep.yaml index 137fc4f..a07a411 100644 --- a/deploy/istio/green-dep.yaml +++ b/deploy/istio/green-dep.yaml @@ -28,7 +28,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-rc.10 + image: quay.io/stefanprodan/podinfo:0.6.0 lifecycle: preStop: exec: @@ -64,5 +64,5 @@ spec: value: "green" - name: message value: "Greetings from podinfo green" - - name: backend_url + - name: backendURL value: "http://podinfo-backend:9898/backend" diff --git a/deploy/istio/store-dep.yaml b/deploy/istio/store-dep.yaml index edf1183..7021e29 100644 --- a/deploy/istio/store-dep.yaml +++ b/deploy/istio/store-dep.yaml @@ -27,7 +27,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-rc.10 + image: quay.io/stefanprodan/podinfo:0.6.0 lifecycle: preStop: exec: diff --git a/deploy/skaffold/test/deployment.yaml b/deploy/skaffold/test/deployment.yaml index 015795c..7d9b4af 100644 --- a/deploy/skaffold/test/deployment.yaml +++ b/deploy/skaffold/test/deployment.yaml @@ -7,6 +7,12 @@ metadata: app: podinfo spec: replicas: 3 + minReadySeconds: 15 + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + maxSurge: 1 selector: matchLabels: app: podinfo @@ -17,9 +23,17 @@ spec: annotations: prometheus.io/scrape: 'true' spec: + terminationGracePeriodSeconds: 30 containers: - name: podinfod - image: quay.io/stefanprodan/podinfo:0.6.0-beta.7 + image: quay.io/stefanprodan/podinfo:0.6.0 + lifecycle: + preStop: + exec: + command: + - /bin/sh + - -c + - sleep 3 command: - ./podinfo - -port=9898 @@ -33,7 +47,7 @@ spec: path: /readyz port: 9898 initialDelaySeconds: 1 - periodSeconds: 5 + periodSeconds: 2 failureThreshold: 1 livenessProbe: httpGet: @@ -51,7 +65,7 @@ spec: value: "blue" - name: message value: "Greetings from podinfo blue" - - name: backend_url + - name: backendURL value: "http://podinfo-backend:9898/echo" - name: configPath value: "/var/secrets" diff --git a/deploy/skaffold/test/service.yaml b/deploy/skaffold/test/service.yaml index 448adf9..4e3e2c4 100644 --- a/deploy/skaffold/test/service.yaml +++ b/deploy/skaffold/test/service.yaml @@ -5,7 +5,7 @@ metadata: labels: app: podinfo spec: - type: ClusterIP + type: LoadBalancer ports: - port: 9898 targetPort: http diff --git a/docs/index.yaml b/docs/index.yaml index fb69994..e35e742 100755 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,7 @@ entries: ambassador: - apiVersion: v1 appVersion: 0.29.0 - created: 2018-08-08T12:15:22.6772993+03:00 + created: 2018-08-16T00:03:51.210499364+03:00 description: A Helm chart for Datawire Ambassador digest: a30c8cb38e696b09fda8269ad8465ce6fec6100cfc108ca85ecbc85913ca5c7f engine: gotpl @@ -19,7 +19,7 @@ entries: grafana: - apiVersion: v1 appVersion: "1.0" - created: 2018-08-08T12:15:22.678122679+03:00 + created: 2018-08-16T00:03:51.211170354+03:00 description: A Helm chart for Kubernetes digest: abdcadc5cddcb7c015aa5bb64e59bfa246774ad9243b3eb3c2a814abb38f2776 name: grafana @@ -29,7 +29,7 @@ entries: ngrok: - apiVersion: v1 appVersion: "1.0" - created: 2018-08-08T12:15:22.678453501+03:00 + created: 2018-08-16T00:03:51.211452823+03:00 description: A Ngrok Helm chart for Kubernetes digest: 7bf5ed2ef63ccd5efb76bcd9a086b04816a162c51d6ab592bccf58c283acd2ea name: ngrok @@ -37,9 +37,25 @@ entries: - https://stefanprodan.github.io/k8s-podinfo/ngrok-0.1.0.tgz version: 0.1.0 podinfo: + - apiVersion: v1 + appVersion: 0.6.0 + created: 2018-08-16T00:03:51.214668506+03:00 + description: Podinfo Helm chart for Kubernetes + digest: 27ba84d7fe19f72e15a7f0b61492268c1a1f5ed8bc5467f87ed04b4409073173 + engine: gotpl + home: https://github.com/stefanprodan/k8s-podinfo + maintainers: + - email: stefanprodan@users.noreply.github.com + name: stefanprodan + name: podinfo + sources: + - https://github.com/stefanprodan/k8s-podinfo + urls: + - https://stefanprodan.github.io/k8s-podinfo/podinfo-0.2.2.tgz + version: 0.2.2 - apiVersion: v1 appVersion: 0.5.1 - created: 2018-08-08T12:15:22.680608978+03:00 + created: 2018-08-16T00:03:51.214206947+03:00 description: Podinfo Helm chart for Kubernetes digest: 631ca3e2db5553541a50b625f538e6a1f2a103c13aa8148fdd38baf2519e5235 engine: gotpl @@ -55,7 +71,7 @@ entries: version: 0.2.1 - apiVersion: v1 appVersion: 0.5.0 - created: 2018-08-08T12:15:22.680193387+03:00 + created: 2018-08-16T00:03:51.213413197+03:00 description: Podinfo Helm chart for Kubernetes digest: dfe7cf44aef0d170549918b00966422a07e7611f9d0081fb34f5b5beb0641c00 engine: gotpl @@ -71,7 +87,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 0.3.0 - created: 2018-08-08T12:15:22.679455262+03:00 + created: 2018-08-16T00:03:51.212459375+03:00 description: Podinfo Helm chart for Kubernetes digest: 4865a2d8b269cf453935cda9661c2efb82c16411471f8c11221a6d03d9bb58b1 engine: gotpl @@ -88,7 +104,7 @@ entries: weave-flux: - apiVersion: v1 appVersion: 1.3.0 - created: 2018-08-08T12:15:22.681895933+03:00 + created: 2018-08-16T00:03:51.216272023+03:00 description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control digest: 1f52e427bb1d728641405f5ad9c514e8861905c110c14db95516629d24443b7d @@ -106,7 +122,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 1.2.5 - created: 2018-08-08T12:15:22.68139671+03:00 + created: 2018-08-16T00:03:51.215743562+03:00 description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control digest: 9e18fb8d175f4fac3b054905c7110d18b6d18f884011df9e9d010c66337da7ec @@ -122,4 +138,4 @@ entries: urls: - https://stefanprodan.github.io/k8s-podinfo/weave-flux-0.1.0.tgz version: 0.1.0 -generated: 2018-08-08T12:15:22.676665435+03:00 +generated: 2018-08-16T00:03:51.209830596+03:00 diff --git a/docs/podinfo-0.2.2.tgz b/docs/podinfo-0.2.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..2383ed77d8ddf359c7fd97f5d367eee98995e1e2 GIT binary patch literal 4422 zcmV-M5xMRkiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PH;dQ{1?c?`QoL{f4~a<1(I)1d??XSC@mlUFs4-g(O#7xl~4D z_snP`TV6>9W`X{QzUTyVYv-hoqKNh?M0M(c7C*siQf~_}}il z^!xq(v+ZsBzu)gK{_j8CslU1RgW>kD|2MdMPF9psX)6EL@BdXgi;eq13N6?Nl!}Qw zhLZuIMNvQYqn)TvQdEg#g|@GboVLI($TLWc%D_ZO_^)z|GDnSyU_NCz#xNDS;AAE; zjA5pAq2gX|%Ji%pM~TRKO5=p)g%l~xdtaWbZl#ALqb%2y*`!^@Y&Hz4GLhC}o0{^li90X=E~thU9y9+8q{e|0k4}sJ@K@xW@hm zJKMuW`#0bZ_J0p$4fb(DORm9bfVJmJDI!9Qjj@F8i89wQ3`rumkTHyTiDXQZFPNt> ztQk{^d%fy~x0?8;=RZB~VKNhhu#8SICIAu(p_mqO9>eb?okvWx&CZ(~fTmOLgaC?? z^CQ7oGLPY4awznXM1{E~M4>!ki6yS*1;(()OQlgB91#FK(t1T8e>uy^zxN@bo4w4#TNL3hyaZyHXEGH#({mKT@*OH*2Cl$*B499m2W%cl~R zTG>#V=R#8xCR7aPmju8t@THCnrlTwTDB)D87)+=*TM4MS>e9qG?v9ovc8mg0J&U17 z0A|8+WAM7Qs&bJ~Zd8D)7(RZot%t5@rbK;cV}OlUT|A>%!Lh5kazFt=`()5spcQQ* zv5p=9oMp@*HS#gIrpI8A+22)9z+mS!BgE*}F>*|_v7qxyLbTv0y~sX(B7{yREN6P| zK65dBg(t{kumNa7#-GcFE61h;5Q|5!`E)-JW>TFk)f(S_CG~F(p+|+s$CgM-UOlJo!X@2+*H=F z4c}bg?civEGecMXDgKzo%(A95)uoDPni{#HeOEnPb}R$QOh6UyA60C`k7`+6A@)~- zrvFJf%@dSg6FmSJ_Y=c`hK$ZZ(=P}VCU^=N%S&C2PmH#PB;nu)w16=JJ)w*nC5#+3 zSAG>GBs7Ops*{<;cI^Z)3AKDZ6s9^!pnH0gepzq&<@n{>4+ncIy2etwNyprvzEhaYLjOggi{^!FNuU{^RqY&v$6_rDW z7RByLxim6)EFJRhA|bfE>|Cks8ETqRO)a57zdIk8V%iI9FnkvEqkc4qpZA~ljiQwb zVJ=D;x=b@h@l7;M?@oj~r80#_UIt*$SBX0uq%L@|Z|?t>1!!633G6(vKUsEMPA2RO zI^BktF%t9J@wX?@cn4b7Vch22%rZHfFiefLTFxW#-{`1Ycx~!1txzz=gc{>kBEw)+ z%e8mHkf#c$L^t}!)c68DV+uCLb1RGe!(#($f{6+Fn-MvfK;@bok=l*A)ie8!X*gw^ zoA^~K!>2MaujIVq_Dazj#qxd{jU;gMxO-o1IR27K0%a8%k} zyXLj^_SOs*lI3~=oqwqAKU8OdnydFVdUnu>k|MybD{0}V()jJuCQPUy$!tykR{aP7_A1udpp5+E}6#~x3RjXsPD6T+j zp@4IbSAbSdv4*YUYrHgx@BlNEOw;KC#IYNF8z2*_tHtSRr8XF)hfCm&qSBIToX%aF z+@kYa!8yyP?~9abbZmuh;%YjY(X;n?JxPsWV95DJLAPjV=BTd%ncYHa*UG|EsHzHj z)D+&T^;Y%XpcmRp#5G>C=xkE~iKIrH>spq$Zh?H~SXraYSZ+!DENOyAD49r)?OL{q z;Yq)Ot5^7gin@)~hJiC^0)R_XKqu&a`zmVE7I1kPFMZZ@Y9^YCl#YU=#S%`F(P;Bf zt+K`80tR#;3Nj<%`>vU6?yi_swz3@UDlDE~UJh~nyEZuHCm}apkTw_8qH0q}t)^O- zHnoLeYLzrc%zz%b zhAeyxGDOC0ieG8QgE&%sgbQGKin)ft&?}5l)l;Tt&8#WN7ByPc${~eyG&G-wBm?bV zs=+6l0{`sOPk)hekk@L6hsmzn(f55+chAbM!K~2pedbbY-+NT`Qyba{K z{U1-CJzdWK?L3VC@1rb4W7GLQi`TupB(3Q|sf9|Y8PxVphGv#9sAdVj2+961agZO0 z^hE`R@=s0~{D99Ac}L|G^;?|y3B(oC74vav%3@vSEv70N%irE?3eeit5kMOG1>Y)Q zw{^s{V1>AoqI6(gKb5Eg1qnln_kGpSt0=u&weor4_IbS5jI%$e+pD+0Rb5TXyRP7; z+G28BmK@qDu0AY{))uR|j-`6%N{gu@krF?0NQ2nz#C=!~={|e(8sY}*wX0mrE8kOc z<{rwj|MxldyNdzW`Tu8w<^0cs|G%Gd%}$PbrQi6YUOc32{*638Iz6(nLewXaRWVbSd!zaZT7#^-@&?UQ*udXcbJ*-?+=Pu>XxOj|Axpr1&*A3gW_vm5%7sn;@e2Rk z&RX2Km%rL`-`g1e1Ko*~!o#E>?Z~O+C3gd=;YbkTtnIX?2 zHS5iU_|l2NwpW!&V&)w_wk&2L>%>_pdF4{8grlS>qr5jR)qE_@3SO!>0P-0@__%J~ zu7C3D^>V6WfRF1p=$RYrJGFEr8hg+_Yk7z#C?EXt|KD<@|JOp&>Am>>;c#jH@6K@h zVf=qD<*xm|Q=13>|84w#r#EJKPt7`yq0@8c@>Q>3`7~0qjt>jLb`4+S(VP8)!+*Z{ zeEearUR-E4QQSf7XeDaf$#l;{#cs1qALP-SZ!69kZ8Q(-#w6C^(RrYI zm%UTTG;VelUrVIv#Z+Qp4e4RLaeu|f|HwErHqC{^JFnxK_}|}NTK^k98x9`g|9zA- zIHKCPas^s|Qvf)fVGiSx@s#CLC}{G9PEkc<4c^U|0#z1vO$^iwIfp41W4CRU<O>|g(4Htm@|{!yLey@t@3CSS_Jo_$he zD^jNg*^0*W3)zZvR*$U{S^5p?xW@jshtHPmzrX#E|Gk&8=I?YO#9!{j6j0DCpTjARTekvaG(~5wKMNpw zMm4CJI8CTR1!Ghi3P}@f544L(eXcrVi4^roca{ey>mowd*5Dvln%dp+_H2|Lun_W2 z0COLL6H~T!^Vm97H_GPS>cuD~WHcHjB3FVVc?2e~)r6F$V~&0+b#(+88f=3~$h%p6 z*#WrYFv?#v0wTB72ZsX_cOKd_%zW`@;p)T9k)`+1jZsUt2lCU#TI+ce6ed>2oGGm= zp@K@9p+;#QskSHB#|Rz|Q%Fl`WL7oK5^@54pR=n(TKZ4D6gg_NpF{aUa{y?iC@ZvX zw#~!Wi4#=dyD$`*$O@5Tt`$(FM8c@{p`ht(Cx31cfYWJA#i?zx z>1GuOvzGRlw~`Qoks}!ed+!YB%iOi$m!lVO0V8|Q&d5O}MQI@1-nbPP2!#~gKC1wH zxlLq{@0iyq(vqh3T$_TCB;wt>v}^y|R`z&Z?ysgW#WS zZo0l7rGhpb{`CB(=c5Ln2P=L z?oJ@MVA3_~-(hR(9V@oB;`)A`QekTd^)W#Dv=KaPIuhS|@cd97%0qc5KXCcK00030 M|6LL6EC5^p03uY&A^-pY literal 0 HcmV?d00001 diff --git a/pkg/version/version.go b/pkg/version/version.go index bf12ff1..2bbe39c 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,4 +1,4 @@ package version -var VERSION = "0.6.0-rc.3" +var VERSION = "0.6.0" var GITCOMMIT = "unknown"