diff --git a/Dockerfile.ci b/Dockerfile.ci index 7dd98f2..3cf0026 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -28,7 +28,7 @@ RUN addgroup -S app \ WORKDIR /home/app COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podinfo . -COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podcli . +COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podcli /usr/local/bin/podcli COPY ./ui ./ui RUN chown -R app:app ./ diff --git a/charts/podinfo-istio/Chart.yaml b/charts/podinfo-istio/Chart.yaml index cb3aaf3..f6eb8c2 100644 --- a/charts/podinfo-istio/Chart.yaml +++ b/charts/podinfo-istio/Chart.yaml @@ -1,12 +1,12 @@ apiVersion: v1 -appVersion: "0.6.0" -description: Podinfo Helm chart for Istio +version: 0.2.0 +appVersion: 1.1.0 +engine: gotpl name: podinfo-istio -version: 0.1.0 +description: Podinfo Helm chart for Istio home: https://github.com/stefanprodan/k8s-podinfo +maintainers: +- email: stefanprodan@users.noreply.github.com + name: stefanprodan sources: - https://github.com/stefanprodan/k8s-podinfo -maintainers: - - name: stefanprodan - email: stefanprodan@users.noreply.github.com -engine: gotpl diff --git a/charts/podinfo-istio/backend.yaml b/charts/podinfo-istio/backend.yaml index 8243bbc..9057f5f 100644 --- a/charts/podinfo-istio/backend.yaml +++ b/charts/podinfo-istio/backend.yaml @@ -6,13 +6,13 @@ host: backend # stable release blue: replicas: 2 - tag: "1.0.0" + tag: "1.1.0" backend: http://store:9898/api/echo # canary release green: replicas: 2 - tag: "1.0.0" + tag: "1.1.0" routing: # target green callers - match: diff --git a/charts/podinfo-istio/frontend.yaml b/charts/podinfo-istio/frontend.yaml index 8190d81..93083e6 100644 --- a/charts/podinfo-istio/frontend.yaml +++ b/charts/podinfo-istio/frontend.yaml @@ -16,14 +16,14 @@ gateway: # stable release blue: replicas: 2 - tag: "1.0.0" - message: "Greetings human! Gabi is THE BEST!!!!" + tag: "1.1.0" + message: "Greetings from the blue frontend" backend: http://backend:9898/api/echo # canary release green: replicas: 2 - tag: "1.0.0" + tag: "1.1.0" routing: # target Safari - match: diff --git a/charts/podinfo-istio/store.yaml b/charts/podinfo-istio/store.yaml index 4349736..a581b95 100644 --- a/charts/podinfo-istio/store.yaml +++ b/charts/podinfo-istio/store.yaml @@ -6,13 +6,13 @@ host: store # load balance 80/20 between blue and green blue: replicas: 2 - tag: "1.0.0" + tag: "1.1.0" backend: https://httpbin.org/anything weight: 80 green: replicas: 2 - tag: "1.0.0" + tag: "1.1.0" backend: https://httpbin.org/anything externalServices: diff --git a/charts/podinfo-istio/templates/blue-deployment.yaml b/charts/podinfo-istio/templates/blue-deployment.yaml index 6b55aea..33e1eb0 100644 --- a/charts/podinfo-istio/templates/blue-deployment.yaml +++ b/charts/podinfo-istio/templates/blue-deployment.yaml @@ -57,15 +57,17 @@ spec: livenessProbe: exec: command: - - /bin/sh - - -c - - wget --quiet --tries=1 --spider http://localhost:{{ .Values.containerPort }}/healthz || exit 1 + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/healthz readinessProbe: exec: command: - - /bin/sh - - -c - - wget --quiet --tries=1 --spider http://localhost:{{ .Values.containerPort }}/readyz || exit 1 + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/readyz volumeMounts: - name: data mountPath: /data diff --git a/charts/podinfo-istio/templates/green-deployment.yaml b/charts/podinfo-istio/templates/green-deployment.yaml index efcb6fe..be869f0 100644 --- a/charts/podinfo-istio/templates/green-deployment.yaml +++ b/charts/podinfo-istio/templates/green-deployment.yaml @@ -58,15 +58,17 @@ spec: livenessProbe: exec: command: - - /bin/sh - - -c - - wget --quiet --tries=1 --spider http://localhost:{{ .Values.containerPort }}/healthz || exit 1 + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/healthz readinessProbe: exec: command: - - /bin/sh - - -c - - wget --quiet --tries=1 --spider http://localhost:{{ .Values.containerPort }}/readyz || exit 1 + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/readyz volumeMounts: - name: data mountPath: /data diff --git a/charts/podinfo-istio/values.yaml b/charts/podinfo-istio/values.yaml index dc42d36..8ab313f 100644 --- a/charts/podinfo-istio/values.yaml +++ b/charts/podinfo-istio/values.yaml @@ -1,6 +1,6 @@ # Default values for podinfo-istio. -# host can be an extarnal domain or a local one +# host can be an external domain or a local one host: podinfo # if the host is an external domain must be exposed via the Gateway exposeHost: false @@ -27,7 +27,7 @@ gateway: blue: replicas: 2 repository: quay.io/stefanprodan/podinfo - tag: "1.0.0" + tag: "1.1.0" # green must have at at least one replica to set weight under 100 weight: 100 message: @@ -41,7 +41,7 @@ blue: green: replicas: 0 repository: quay.io/stefanprodan/podinfo - tag: "1.0.0" + tag: "1.1.0" message: backend: routing: diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml index 848fcb7..b3cd4fb 100644 --- a/charts/podinfo/Chart.yaml +++ b/charts/podinfo/Chart.yaml @@ -1,12 +1,12 @@ apiVersion: v1 -appVersion: 1.0.0 -description: Podinfo Helm chart for Kubernetes +version: 1.1.0 +appVersion: 1.1.0 +name: podinfo engine: gotpl +description: Podinfo Helm chart for Kubernetes 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 -version: 1.0.1 diff --git a/charts/podinfo/templates/deployment.yaml b/charts/podinfo/templates/deployment.yaml index 9d1257f..3343238 100644 --- a/charts/podinfo/templates/deployment.yaml +++ b/charts/podinfo/templates/deployment.yaml @@ -57,20 +57,20 @@ spec: - name: http containerPort: {{ .Values.service.containerPort }} protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 2 - failureThreshold: 1 livenessProbe: - httpGet: - path: /healthz - port: 9898 - initialDelaySeconds: 1 - periodSeconds: 10 - failureThreshold: 2 + exec: + command: + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/healthz + readinessProbe: + exec: + command: + - podcli + - check + - http + - http://localhost:{{ .Values.service.containerPort }}/readyz volumeMounts: - name: data mountPath: /data diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 91ceeb6..f1b9fe6 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -12,7 +12,7 @@ faults: image: repository: quay.io/stefanprodan/podinfo - tag: 1.0.0 + tag: 1.1.0 pullPolicy: IfNotPresent service: diff --git a/cmd/podcli/version.go b/cmd/podcli/version.go index 9f6c978..2cf71a6 100644 --- a/cmd/podcli/version.go +++ b/cmd/podcli/version.go @@ -7,13 +7,13 @@ import ( "github.com/stefanprodan/k8s-podinfo/pkg/version" ) -func init() { +func init() { rootCmd.AddCommand(versionCmd) } var versionCmd = &cobra.Command{ - Use: `version`, - Short: "Prints podcli version", + Use: `version`, + Short: "Prints podcli version", RunE: func(cmd *cobra.Command, args []string) error { fmt.Println(version.VERSION) return nil diff --git a/docs/ambassador-0.1.0.tgz b/docs/ambassador-0.1.0.tgz index 2e3b499..4acb8cf 100644 Binary files a/docs/ambassador-0.1.0.tgz and b/docs/ambassador-0.1.0.tgz differ diff --git a/docs/grafana-0.1.0.tgz b/docs/grafana-0.1.0.tgz index ade4547..edf26be 100644 Binary files a/docs/grafana-0.1.0.tgz and b/docs/grafana-0.1.0.tgz differ diff --git a/docs/index.yaml b/docs/index.yaml index 42a2936..6c004f8 100755 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,9 +3,9 @@ entries: ambassador: - apiVersion: v1 appVersion: 0.29.0 - created: 2018-08-21T18:51:24.168305347+03:00 + created: 2018-09-08T11:36:06.780759116+03:00 description: A Helm chart for Datawire Ambassador - digest: a30c8cb38e696b09fda8269ad8465ce6fec6100cfc108ca85ecbc85913ca5c7f + digest: e47efa287956046b96957e9e24c3d5d939992f557563c29e12ed92d43302be6d engine: gotpl maintainers: - email: stefanprodan@users.noreply.github.com @@ -19,9 +19,9 @@ entries: grafana: - apiVersion: v1 appVersion: "1.0" - created: 2018-08-21T18:51:24.169038265+03:00 + created: 2018-09-08T11:36:06.781595666+03:00 description: A Helm chart for Kubernetes - digest: e5b37ccdb6c477e36448cb1c1e02f35bbad5c67d3bbff712736cbdf21b48dd8c + digest: 414ebcc86d50191f8b9f44320c5b24f304a28ad8fb441319c055a9c3fef9018f name: grafana urls: - https://stefanprodan.github.io/k8s-podinfo/grafana-0.1.0.tgz @@ -29,9 +29,9 @@ entries: loadtest: - apiVersion: v1 appVersion: "1.0" - created: 2018-08-21T18:51:24.169257472+03:00 + created: 2018-09-08T11:36:06.781794881+03:00 description: Hey load test Helm chart for Kubernetes - digest: b9fc7ca83ae2c669a65d6cecf1ca4cf729b9db535179aab1d57c49bbeefd11b9 + digest: 7689a7beedce35fef70ca6659d060a3e37c55d9a6c3af0941477d76e2f1683c7 name: loadtest urls: - https://stefanprodan.github.io/k8s-podinfo/loadtest-0.1.0.tgz @@ -39,17 +39,33 @@ entries: ngrok: - apiVersion: v1 appVersion: "1.0" - created: 2018-08-21T18:51:24.169542029+03:00 + created: 2018-09-08T11:36:06.782060752+03:00 description: A Ngrok Helm chart for Kubernetes - digest: 7bf5ed2ef63ccd5efb76bcd9a086b04816a162c51d6ab592bccf58c283acd2ea + digest: fc044fd5e97cda2d17b01ed82a4cac816367052d6f646079f16573220c4723b4 name: ngrok urls: - https://stefanprodan.github.io/k8s-podinfo/ngrok-0.1.0.tgz version: 0.1.0 podinfo: + - apiVersion: v1 + appVersion: 1.1.0 + created: 2018-09-08T11:36:06.78680158+03:00 + description: Podinfo Helm chart for Kubernetes + digest: 973d60c629d7ae476776098ad6b654d78d91f91b3faa8bc016b94c73c42be094 + 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-1.1.0.tgz + version: 1.1.0 - apiVersion: v1 appVersion: 1.0.0 - created: 2018-08-21T18:51:24.173785478+03:00 + created: 2018-09-08T11:36:06.786342356+03:00 description: Podinfo Helm chart for Kubernetes digest: 82068727ba5b552341b14a980e954e27a8517f0ef76aab314c160b0f075e6de4 engine: gotpl @@ -65,7 +81,7 @@ entries: version: 1.0.0 - apiVersion: v1 appVersion: 0.6.0 - created: 2018-08-21T18:51:24.173287096+03:00 + created: 2018-09-08T11:36:06.785478988+03:00 description: Podinfo Helm chart for Kubernetes digest: bd25a710eddb3985d3bd921a11022b5c68a04d37cf93a1a4aab17eeda35aa2f8 engine: gotpl @@ -81,7 +97,7 @@ entries: version: 0.2.2 - apiVersion: v1 appVersion: 0.5.1 - created: 2018-08-21T18:51:24.17260811+03:00 + created: 2018-09-08T11:36:06.784529082+03:00 description: Podinfo Helm chart for Kubernetes digest: 631ca3e2db5553541a50b625f538e6a1f2a103c13aa8148fdd38baf2519e5235 engine: gotpl @@ -97,7 +113,7 @@ entries: version: 0.2.1 - apiVersion: v1 appVersion: 0.5.0 - created: 2018-08-21T18:51:24.171814296+03:00 + created: 2018-09-08T11:36:06.783626713+03:00 description: Podinfo Helm chart for Kubernetes digest: dfe7cf44aef0d170549918b00966422a07e7611f9d0081fb34f5b5beb0641c00 engine: gotpl @@ -113,7 +129,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 0.3.0 - created: 2018-08-21T18:51:24.17094332+03:00 + created: 2018-09-08T11:36:06.782841845+03:00 description: Podinfo Helm chart for Kubernetes digest: 4865a2d8b269cf453935cda9661c2efb82c16411471f8c11221a6d03d9bb58b1 engine: gotpl @@ -128,9 +144,25 @@ entries: - https://stefanprodan.github.io/k8s-podinfo/podinfo-0.1.0.tgz version: 0.1.0 podinfo-istio: + - apiVersion: v1 + appVersion: 1.1.0 + created: 2018-09-08T11:36:06.789393642+03:00 + description: Podinfo Helm chart for Istio + digest: bcceb63ff780a8f0ba0b30997040e4e82170f9cce17c26ec817648ed024c83f5 + engine: gotpl + home: https://github.com/stefanprodan/k8s-podinfo + maintainers: + - email: stefanprodan@users.noreply.github.com + name: stefanprodan + name: podinfo-istio + sources: + - https://github.com/stefanprodan/k8s-podinfo + urls: + - https://stefanprodan.github.io/k8s-podinfo/podinfo-istio-0.2.0.tgz + version: 0.2.0 - apiVersion: v1 appVersion: 0.6.0 - created: 2018-08-21T18:51:24.174402168+03:00 + created: 2018-09-08T11:36:06.788591612+03:00 description: Podinfo Helm chart for Istio digest: f12f8aa1eca1328e9eaa30bd757f6ed3ff97205e2bf016a47265bc2de6a63d8f engine: gotpl @@ -144,4 +176,4 @@ entries: urls: - https://stefanprodan.github.io/k8s-podinfo/podinfo-istio-0.1.0.tgz version: 0.1.0 -generated: 2018-08-21T18:51:24.167544997+03:00 +generated: 2018-09-08T11:36:06.780217936+03:00 diff --git a/docs/loadtest-0.1.0.tgz b/docs/loadtest-0.1.0.tgz index 7ee9715..278cdab 100644 Binary files a/docs/loadtest-0.1.0.tgz and b/docs/loadtest-0.1.0.tgz differ diff --git a/docs/ngrok-0.1.0.tgz b/docs/ngrok-0.1.0.tgz index fbf2306..20c4cfa 100644 Binary files a/docs/ngrok-0.1.0.tgz and b/docs/ngrok-0.1.0.tgz differ diff --git a/docs/podinfo-1.1.0.tgz b/docs/podinfo-1.1.0.tgz new file mode 100644 index 0000000..c87fe55 Binary files /dev/null and b/docs/podinfo-1.1.0.tgz differ diff --git a/docs/podinfo-istio-0.2.0.tgz b/docs/podinfo-istio-0.2.0.tgz new file mode 100644 index 0000000..b6cf694 Binary files /dev/null and b/docs/podinfo-istio-0.2.0.tgz differ diff --git a/pkg/version/version.go b/pkg/version/version.go index a139730..1bd77e4 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,4 +1,4 @@ package version -var VERSION = "1.0.1" +var VERSION = "1.1.0" var REVISION = "unknown"