Merge pull request #57 from stefanprodan/release-3.2.3

Release v3.2.3

Makefile

@@ -57,6 +57,10 @@ version-set:
 	sed -i '' "s/appVersion: $$current/appVersion: $$next/g" charts/podinfo/Chart.yaml && \
 	sed -i '' "s/version: $$current/version: $$next/g" charts/podinfo/Chart.yaml && \
 	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" kustomize/deployment.yaml && \
+	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/webapp/frontend/deployment.yaml && \
+	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/webapp/backend/deployment.yaml && \
+	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/frontend/deployment.yaml && \
+	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/backend/deployment.yaml && \
 	echo "Version $$next set in code, deployment, chart and kustomize"
 
 release:

charts/podinfo/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 3.2.2
+version: 3.2.3
-appVersion: 3.2.2
+appVersion: 3.2.3
 name: podinfo
 engine: gotpl
 description: Podinfo Helm chart for Kubernetes

charts/podinfo/README.md

@@ -29,48 +29,53 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following tables lists the configurable parameters of the podinfo chart and their default values.
 
-Parameter | Description | Default
+Parameter | Default | Description
 --- | --- | ---
-`affinity` | node/pod affinities | None
+`replicaCount` | `1` | Desired number of pods
-`backend` | echo backend URL | None
+`logLevel` | `info` | Log level: `debug`, `info`, `warn`, `error`, `flat` or `panic`
-`backends` | echo backend URL array | None
+`backend` | `None` | Echo backend URL
-`faults.delay` | random HTTP response delays between 0 and 5 seconds | `false`
+`backends` | `[]` | Array of echo backend URLs
-`faults.error` | 1/3 chances of a random HTTP response error | `false`
+`ui.color` | `#34577c` |  UI color
-`faults.unhealthy` | when set, the healthy state is never reached | `false`
+`ui.message` | `None` |  UI greetings message
-`faults.unready` | when set, the ready state is never reached | `false`
+`ui.logo` | `None` |  UI logo
-`hpa.enabled` | enables HPA | `false`
+`faults.delay` | `false` | Random HTTP response delays between 0 and 5 seconds
-`hpa.cpu` | target CPU usage per pod | None
+`faults.error` | `false` | 1/3 chances of a random HTTP response error
-`hpa.memory` | target memory usage per pod | None
+`faults.unhealthy` | `false` | When set, the healthy state is never reached
-`hpa.requests` | target requests per second per pod | None
+`faults.unready` | `false` | When set, the ready state is never reached
-`hpa.maxReplicas` | maximum pod replicas | `10`
+`h2c.enabled` | `false` | Allow upgrading to h2c
-`image.pullPolicy` | image pull policy | `IfNotPresent`
+`image.repository` | `stefanprodan/podinfo` | Image repository
-`image.repository` | image repository | `stefanprodan/podinfo`
+`image.tag` | `<VERSION>` | Image tag
-`image.tag` | image tag | `<VERSION>`
+`image.pullPolicy` | `IfNotPresent` | Image pull policy
-`ingress.enabled` | enables ingress | `false`
+`service.enabled` | `true` | Create a Kubernetes Service, should be disabled when using [Flagger](https://flagger.app)
-`ingress.annotations` | ingress annotations | None
+`service.type` | `ClusterIP` | Type of the Kubernetes Service
-`ingress.hosts` | ingress accepted hostnames | None
+`service.metricsPort` | `9797` | Prometheus metrics endpoint port
-`ingress.tls` | ingress TLS configuration | None
+`service.httpPort` | `9898` | Container HTTP port
-`message` | UI greetings message | None
+`service.externalPort` | `9898` | ClusterIP HTTP port
-`nodeSelector` | node labels for pod assignment | `{}`
+`service.grpcPort` | `9999` | ClusterIP gPRC port
-`replicaCount` | desired number of pods | `2`
+`service.grpcService` | `podinfo` | gPRC service name
-`resources.requests/cpu` | pod CPU request | `1m`
+`service.nodePort` | `31198` | NodePort for the HTTP endpoint
-`resources.requests/memory` | pod memory request | `16Mi`
+`hpa.enabled` | `false` | Enables the Kubernetes HPA
-`resources.limits/cpu` | pod CPU limit | None
+`hpa.maxReplicas` | `10` | Maximum amount of pods
-`resources.limits/memory` | pod memory limit | None
+`hpa.cpu` | `None` | Target CPU usage per pod
-`service.enabled` | create Kubernetes service (should be disabled when using Flagger) | `true`
+`hpa.memory` | `None` | Target memory usage per pod
-`service.metricsPort` | Prometheus metrics endpoint port | `9797`
+`hpa.requests` | `None` | Target HTTP requests per second per pod
-`service.externalPort` | ClusterIP HTTP port | `9898`
+`serviceAccount.enabled` | `false` | Whether a service account should be created
-`service.httpPort` | container HTTP port | `9898`
+`serviceAccount.name` | `None` | The name of the service account to use, if not set and create is true, a name is generated using the fullname template
-`service.nodePort` | NodePort for the HTTP endpoint | `31198`
+`linkerd.profile.enabled` | `false` | Create Linkerd service profile
-`service.grpcPort` | ClusterIP gPRC port | `9999`
+`serviceMonitor.enabled` | `false` | Whether a Prometheus Operator service monitor should be created
-`service.grpcService` | gPRC service name | `podinfo`
+`serviceMonitor.interval` | `15s` | Prometheus scraping interval
-`service.type` | type of service | `ClusterIP`
+`ingress.enabled` | `false` | Enables Ingress
-`tolerations` | list of node taints to tolerate | `[]`
+`ingress.annotations` | `{}` | Ingress annotations
-`serviceAccount.enabled` | specifies whether a service account should be created | `false`
+`ingress.path` | `/*` | Ingress path
-`serviceAccount.name` | the name of the service account to use, if not set and create is true, a name is generated using the fullname template | None
+`ingress.hosts` | `[]` | Ingress accepted hosts
-`linkerd.profile.enabled` | create Linkerd service profile | `false`
+`ingress.tls` | `[]` | Ingress TLS configuration
-`serviceMonitor.enabled` | specifies whether a Prometheus Operator service monitor should be created | `false`
+`resources.requests.cpu` | `1m` | Pod CPU request
-`serviceMonitor.interval` | Prometheus scraping interval | `15s`
+`resources.requests.memory` | `16Mi` | Pod memory request
+`resources.limits.cpu` | `None` | Pod CPU limit
+`resources.limits.memory` | `None` | Pod memory limit
+`nodeSelector` | `{}` | Node labels for pod assignment
+`tolerations` | `[]` | List of node taints to tolerate
+`affinity` | `None` | Node/pod affinities
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
@@ -86,5 +91,3 @@ $ helm install stable/podinfo --name my-release -f values.yaml
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
-```
-

charts/podinfo/values.yaml

@@ -21,7 +21,7 @@ h2c:
 
 image:
   repository: stefanprodan/podinfo
-  tag: 3.2.2
+  tag: 3.2.3
   pullPolicy: IfNotPresent
 
 service:

deploy/README.md

@@ -0,0 +1,32 @@
+# Deploy demo webapp 
+
+Demo webapp manifests:
+- [common](webapp/common)
+- [frontend](webapp/frontend)
+- [backend](webapp/backend)
+
+Deploy the demo in `webapp` namespace:
+
+```bash
+kubectl apply -f ./webapp/common
+kubectl apply -f ./webapp/backend
+kubectl apply -f ./webapp/frontend
+```
+
+Deploy the demo in the `dev` namespace:
+
+```bash
+kustomize build ./overlays/dev | kubectl apply -f-
+```
+
+Deploy the demo in the `staging` namespace:
+
+```bash
+kustomize build ./overlays/staging | kubectl apply -f-
+```
+
+Deploy the demo in the `production` namespace:
+
+```bash
+kustomize build ./overlays/production | kubectl apply -f-
+```

deploy/bases/backend/deployment.yaml

@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: backend
+spec:
+  minReadySeconds: 3
+  revisionHistoryLimit: 5
+  progressDeadlineSeconds: 60
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: backend
+  template:
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9797"
+      labels:
+        app: backend
+    spec:
+      containers:
+      - name: backend
+        image: stefanprodan/podinfo:3.2.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: http
+          containerPort: 9898
+          protocol: TCP
+        - name: http-metrics
+          containerPort: 9797
+          protocol: TCP
+        - name: grpc
+          containerPort: 9999
+          protocol: TCP
+        command:
+        - ./podinfo
+        - --port=9898
+        - --port-metrics=9797
+        - --grpc-port=9999
+        - --grpc-service-name=backend
+        - --level=info
+        env:
+        - name: PODINFO_UI_COLOR
+          value: "#34577c"
+        livenessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        readinessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/readyz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        resources:
+          limits:
+            cpu: 2000m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 32Mi

deploy/bases/backend/hpa.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: backend
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: backend
+  minReplicas: 1
+  maxReplicas: 2
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 99

deploy/bases/backend/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - service.yaml
+  - deployment.yaml
+  - hpa.yaml
+

deploy/bases/backend/service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: backend
+spec:
+  type: ClusterIP
+  selector:
+    app: backend
+  ports:
+    - name: http
+      port: 9898
+      protocol: TCP
+      targetPort: http
+    - port: 9999
+      targetPort: grpc
+      protocol: TCP
+      name: grpc

deploy/bases/frontend/deployment.yaml

@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: frontend
+spec:
+  minReadySeconds: 3
+  revisionHistoryLimit: 5
+  progressDeadlineSeconds: 60
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: frontend
+  template:
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9797"
+      labels:
+        app: frontend
+    spec:
+      containers:
+      - name: frontend
+        image: stefanprodan/podinfo:3.2.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: http
+          containerPort: 9898
+          protocol: TCP
+        - name: http-metrics
+          containerPort: 9797
+          protocol: TCP
+        - name: grpc
+          containerPort: 9999
+          protocol: TCP
+        command:
+        - ./podinfo
+        - --port=9898
+        - --port-metrics=9797
+        - --level=info
+        - --backend-url=http://backend:9898/echo
+        env:
+        - name: PODINFO_UI_COLOR
+          value: "#34577c"
+        livenessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        readinessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/readyz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 128Mi
+          requests:
+            cpu: 100m
+            memory: 32Mi

deploy/bases/frontend/hpa.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: frontend
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: backend
+  minReplicas: 1
+  maxReplicas: 4
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 99

deploy/bases/frontend/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - service.yaml
+  - deployment.yaml
+  - hpa.yaml
+

deploy/bases/frontend/service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+spec:
+  type: ClusterIP
+  selector:
+    app: frontend
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: http

deploy/overlays/dev/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: dev
+resources:
+  - ../../bases/backend
+  - ../../bases/frontend
+  - namespace.yaml
+transformers:
+  - labels.yaml

deploy/overlays/dev/labels.yaml

@@ -0,0 +1,10 @@
+apiVersion: builtin
+kind: LabelTransformer
+metadata:
+  name: labels
+labels:
+  env: dev
+  instance: webapp
+fieldSpecs:
+  - path: metadata/labels
+    create: true

deploy/overlays/dev/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dev

deploy/overlays/production/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: production
+resources:
+  - ../../bases/backend
+  - ../../bases/frontend
+  - namespace.yaml
+transformers:
+  - labels.yaml

deploy/overlays/production/labels.yaml

@@ -0,0 +1,10 @@
+apiVersion: builtin
+kind: LabelTransformer
+metadata:
+  name: labels
+labels:
+  env: production
+  instance: webapp
+fieldSpecs:
+  - path: metadata/labels
+    create: true

deploy/overlays/production/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: production

deploy/overlays/staging/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: staging
+resources:
+  - ../../bases/backend
+  - ../../bases/frontend
+  - namespace.yaml
+transformers:
+  - labels.yaml

deploy/overlays/staging/labels.yaml

@@ -0,0 +1,10 @@
+apiVersion: builtin
+kind: LabelTransformer
+metadata:
+  name: labels
+labels:
+  env: staging
+  instance: webapp
+fieldSpecs:
+  - path: metadata/labels
+    create: true

deploy/overlays/staging/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: staging

deploy/webapp/backend/deployment.yaml

@@ -0,0 +1,74 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: backend
+  namespace: webapp
+spec:
+  minReadySeconds: 3
+  revisionHistoryLimit: 5
+  progressDeadlineSeconds: 60
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: backend
+  template:
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9797"
+      labels:
+        app: backend
+    spec:
+      serviceAccountName: webapp
+      containers:
+      - name: backend
+        image: stefanprodan/podinfo:3.2.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: http
+          containerPort: 9898
+          protocol: TCP
+        - name: http-metrics
+          containerPort: 9797
+          protocol: TCP
+        - name: grpc
+          containerPort: 9999
+          protocol: TCP
+        command:
+        - ./podinfo
+        - --port=9898
+        - --port-metrics=9797
+        - --grpc-port=9999
+        - --grpc-service-name=backend
+        - --level=info
+        env:
+        - name: PODINFO_UI_COLOR
+          value: "#34577c"
+        livenessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        readinessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/readyz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        resources:
+          limits:
+            cpu: 2000m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 32Mi

deploy/webapp/backend/hpa.yaml

@@ -0,0 +1,19 @@
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: backend
+  namespace: webapp
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: backend
+  minReplicas: 1
+  maxReplicas: 2
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 99

deploy/webapp/backend/service.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: backend
+  namespace: webapp
+spec:
+  type: ClusterIP
+  selector:
+    app: backend
+  ports:
+    - name: http
+      port: 9898
+      protocol: TCP
+      targetPort: http
+    - port: 9999
+      targetPort: grpc
+      protocol: TCP
+      name: grpc

deploy/webapp/common/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: webapp

deploy/webapp/common/service-account.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: webapp
+  namespace: webapp

deploy/webapp/frontend/deployment.yaml

@@ -0,0 +1,73 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: frontend
+  namespace: webapp
+spec:
+  minReadySeconds: 3
+  revisionHistoryLimit: 5
+  progressDeadlineSeconds: 60
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: frontend
+  template:
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "9797"
+      labels:
+        app: frontend
+    spec:
+      serviceAccountName: webapp
+      containers:
+      - name: frontend
+        image: stefanprodan/podinfo:3.2.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: http
+          containerPort: 9898
+          protocol: TCP
+        - name: http-metrics
+          containerPort: 9797
+          protocol: TCP
+        - name: grpc
+          containerPort: 9999
+          protocol: TCP
+        command:
+        - ./podinfo
+        - --port=9898
+        - --port-metrics=9797
+        - --level=info
+        - --backend-url=http://backend:9898/echo
+        env:
+        - name: PODINFO_UI_COLOR
+          value: "#34577c"
+        livenessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        readinessProbe:
+          exec:
+            command:
+            - podcli
+            - check
+            - http
+            - localhost:9898/readyz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        resources:
+          limits:
+            cpu: 1000m
+            memory: 128Mi
+          requests:
+            cpu: 100m
+            memory: 32Mi

deploy/webapp/frontend/hpa.yaml

@@ -0,0 +1,19 @@
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: frontend
+  namespace: webapp
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: backend
+  minReplicas: 1
+  maxReplicas: 4
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 99

deploy/webapp/frontend/service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+  namespace: webapp
+spec:
+  type: ClusterIP
+  selector:
+    app: frontend
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: http

kustomize/deployment.yaml

@@ -2,8 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: podinfo
-  labels:
-    app: podinfo
 spec:
   minReadySeconds: 3
   revisionHistoryLimit: 5
@@ -25,7 +23,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: stefanprodan/podinfo:3.2.2
+        image: stefanprodan/podinfo:3.2.3
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

kustomize/kustomization.yaml

@@ -2,3 +2,6 @@ resources:
   - hpa.yaml
   - deployment.yaml
   - service.yaml
+
+commonLabels:
+  app: podinfo

kustomize/service.yaml

@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: podinfo
-  labels:
-    app: podinfo
 spec:
   type: ClusterIP
   selector:

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "3.2.2"
+var VERSION = "3.2.3"
 var REVISION = "unknown"