Merge pull request codefresh-io#185 from codefresh-io/feat-pdb

feat: add PDBs

Author: mikhail-klimko

.gitignore

@@ -13,4 +13,5 @@ output
 
 # ignore local dev
 values-dev.yaml
-dry-run.yaml
+dry-run.yaml
+values-test.yaml

charts/gitops-runtime/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.1.44
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
-version: 0.5.2
+version: 0.6.0
 home: https://github.com/codefresh-io/gitops-runtime-helm
 icon: https://avatars1.githubusercontent.com/u/11412079?v=3
 keywords:
@@ -14,10 +14,8 @@ maintainers:
 annotations:
   artifacthub.io/alternativeName: "codefresh-gitops-runtime"
   artifacthub.io/changes: |
-    - kind: changed
-      description: "update codefresh-gitops-operator chart to 1.0.9 to handle promotions"
-    - kind: changed
-      description: "update cap-app-proxy to 1.2727.0 (exopse gitLog endpoint)"
+    - kind: added
+      description: "Add PDB templates for internal-router and app-proxy"
 dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm

charts/gitops-runtime/README.md

@@ -1,5 +1,5 @@
 ## Codefresh gitops runtime
-![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![AppVersion: 0.1.44](https://img.shields.io/badge/AppVersion-0.1.44-informational?style=flat-square)
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: 0.1.44](https://img.shields.io/badge/AppVersion-0.1.44-informational?style=flat-square)
 
 ## Prerequisites
 
@@ -27,7 +27,7 @@ We have created a helper utility to resolve this issue:
 The utility is packaged in a container image. Below are instructions on executing the utility using Docker:
 
 ```
-docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.5.2 <local_registry>
+docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.6.0 <local_registry>
 ```
 `output_dir` - is a local directory where the utility will output files. <br>
 `local_registry` - is your local registry where you want to mirror the images to
@@ -119,6 +119,9 @@ sealed-secrets:
 | app-proxy.livenessProbe.timeoutSeconds | int | `10` | Number of seconds after which the [probe] times out. |
 | app-proxy.nameOverride | string | `""` |  |
 | app-proxy.nodeSelector | object | `{}` |  |
+| app-proxy.pdb.enabled | bool | `false` | Enable PDB |
+| app-proxy.pdb.maxUnavailable | string | `""` | Set number of pods that are unavailable after eviction as number or percentage |
+| app-proxy.pdb.minAvailable | int | `1` | Set number of pods that are available after eviction as number or percentage |
 | app-proxy.podAnnotations | object | `{}` |  |
 | app-proxy.podLabels | object | `{}` |  |
 | app-proxy.podSecurityContext | object | `{}` |  |
@@ -306,6 +309,9 @@ sealed-secrets:
 | internal-router.imagePullSecrets | list | `[]` |  |
 | internal-router.nameOverride | string | `""` |  |
 | internal-router.nodeSelector | object | `{}` |  |
+| internal-router.pdb.enabled | bool | `false` | Enable PDB |
+| internal-router.pdb.maxUnavailable | string | `""` | Set number of pods that are unavailable after eviction as number or percentage |
+| internal-router.pdb.minAvailable | int | `1` | Set number of pods that are available after eviction as number or percentage |
 | internal-router.podAnnotations | object | `{}` |  |
 | internal-router.podLabels | object | `{}` |  |
 | internal-router.podSecurityContext | object | `{}` |  |

charts/gitops-runtime/templates/_components/cap-app-proxy/_pdb.yaml

@@ -0,0 +1,21 @@
+{{- define "cap-app-proxy.resources.pdb" }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "cap-app-proxy.fullname" . }}
+  labels:
+    {{- include "cap-app-proxy.labels" . | nindent 4 }}
+spec:
+{{- if or .Values.pdb.minAvailable .Values.pdb.maxUnavailable }}
+  {{- with .Values.pdb.minAvailable }}
+  minAvailable: {{ . }}
+  {{- end }}
+  {{- with .Values.pdb.maxUnavailable }}
+  maxUnavailable: {{ . }}
+  {{- end }}
+{{- else }}
+  {{- fail (printf "ERROR: pdb.minAvailable or pdb.maxUnavailable is required!" ) }}
+{{- end }}
+  selector:
+    matchLabels: {{- include "cap-app-proxy.selectorLabels" . | nindent 6 }}
+{{- end }}

charts/gitops-runtime/templates/_components/internal-router/_pdb.yaml

@@ -0,0 +1,21 @@
+{{- define "internal-router.resources.pdb" }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "internal-router.fullname" . }}
+  labels:
+    {{- include "internal-router.labels" . | nindent 4 }}
+spec:
+{{- if or .Values.pdb.minAvailable .Values.pdb.maxUnavailable }}
+  {{- with .Values.pdb.minAvailable }}
+  minAvailable: {{ . }}
+  {{- end }}
+  {{- with .Values.pdb.maxUnavailable }}
+  maxUnavailable: {{ . }}
+  {{- end }}
+{{- else }}
+  {{- fail (printf "ERROR: pdb.minAvailable or pdb.maxUnavailable is required!" ) }}
+{{- end }}
+  selector:
+    matchLabels: {{- include "internal-router.selectorLabels" . | nindent 6 }}
+{{- end }}

charts/gitops-runtime/templates/app-proxy/pdb.yaml

@@ -0,0 +1,7 @@
+{{- $appProxyContext := deepCopy . }}
+{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
+{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+
+{{- if $appProxyContext.Values.pdb.enabled }}
+{{- include "cap-app-proxy.resources.pdb" $appProxyContext }}
+{{- end }}

charts/gitops-runtime/templates/internal-router/pdb.yaml

@@ -0,0 +1,7 @@
+{{- $internalRouterContext := deepCopy . }}
+{{- $_ := set $internalRouterContext "Values" (get .Values "internal-router") }}
+{{- $_ := set $internalRouterContext.Values "global" (get .Values "global") }}
+
+{{- if $internalRouterContext.Values.pdb.enabled }}
+{{- include "internal-router.resources.pdb" $internalRouterContext }}
+{{- end }}

charts/gitops-runtime/values.yaml

@@ -420,6 +420,16 @@ internal-router:
   dnsService: kube-dns
   dnsNamespace: kube-system
   clusterDomain: cluster.local
+
+  ## Internal-Router Pod Disruption Budget
+  pdb:
+    # -- Enable PDB
+    enabled: false
+    # -- Set number of pods that are available after eviction as number or percentage
+    minAvailable: 1
+    # -- Set number of pods that are unavailable after eviction as number or percentage
+    maxUnavailable: ""
+
 #-----------------------------------------------------------------------------------------------------------------------
 # tunnel client
 #-----------------------------------------------------------------------------------------------------------------------
@@ -588,6 +598,15 @@ app-proxy:
   # -- extra volumes
   extraVolumes: []
 
+  ## App-Proxy Pod Disruption Budget
+  pdb:
+    # -- Enable PDB
+    enabled: false
+    # -- Set number of pods that are available after eviction as number or percentage
+    minAvailable: 1
+    # -- Set number of pods that are unavailable after eviction as number or percentage
+    maxUnavailable: ""
+
 #-----------------------------------------------------------------------------------------------------------------------
 # gitops-operator
 #-----------------------------------------------------------------------------------------------------------------------