[skip-ci] Update artifacts

Add Liveness and readiness probe timeout values

.github/workflows/pull_request.yaml

@@ -113,7 +113,7 @@ jobs:
       env:
        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
       with:
-        message: '@${{ github.actor }} Image is available for testing. `docker pull ${{ github.repository }}:${{ steps.generate_tag.outputs.GIT_TAG }}`'
+        message: '@${{ github.actor }} Image is available for testing. `docker pull ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`'
         allow-repeats: false
 
     - name: Notify Failure

.github/workflows/push.yaml

@@ -127,6 +127,10 @@ jobs:
           VERSION: ${{ steps.generate_operator_tag.outputs.new_tag }}
         run: make bump-chart
 
+      - name: Helm Template
+        run: |
+          helm template stakater deployments/kubernetes/chart/reloader/ > deployments/kubernetes/reloader.yaml
+
       # Publish helm chart
       - name: Publish Helm chart
         uses: stefanprodan/helm-gh-pages@master

Makefile

@@ -93,3 +93,4 @@ bump-chart:
 	sed -i "s/^version:.*/version: v$(VERSION)/" deployments/kubernetes/chart/reloader/Chart.yaml
 	sed -i "s/^appVersion:.*/appVersion: v$(VERSION)/" deployments/kubernetes/chart/reloader/Chart.yaml
 	sed -i "s/tag:.*/tag: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml
+	sed -i "s/version:.*/version: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml

README.md

@@ -221,6 +221,13 @@ You can also set the log format of Reloader to json by setting `logFormat` to `j
 
 You can enable to scrape Reloader's Prometheus metrics by setting `serviceMonitor.enabled` or `podMonitor.enabled`  to `true` in values.yaml file. Service monitor will be removed in future releases of reloader in favour of Pod monitor.
 
+**Note:** Reloading of OpenShift (DeploymentConfig) and/or Argo Rollouts has to be enabled explicitly because it might not be always possible to use it on a cluster with restricted permissions. This can be done by changing the following parameters:
+
+| Parameter        | Description                                                                  | Type    |
+| ---------------- | ---------------------------------------------------------------------------- | ------- |
+| isOpenshift      | Enable OpenShift DeploymentConfigs. Valid value are either `true` or `false` | boolean |
+| isArgoRollouts   | Enable Argo Rollouts. Valid value are either `true` or `false`               | boolean |
+
 ## Help
 
 ### Documentation

deployments/kubernetes/chart/reloader/Chart.yaml

@@ -3,14 +3,14 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: v0.0.91
-appVersion: v0.0.91
+version: v0.0.97
+appVersion: v0.0.97
 keywords:
   - Reloader
   - kubernetes
 home: https://github.com/stakater/Reloader
 sources:
-  - https://github.com/stakater/IngressMonitorController
+  - https://github.com/stakater/Reloader
 icon: https://raw.githubusercontent.com/stakater/Reloader/master/assets/web/reloader-round-100px.png
 maintainers:
   - name: Stakater

deployments/kubernetes/chart/reloader/templates/clusterrole.yaml

@@ -32,7 +32,7 @@ rules:
       - list
       - get
       - watch
-{{- if or (.Capabilities.APIVersions.Has "apps.openshift.io/v1") (.Values.reloader.isOpenshift) }}
+{{- if and (.Capabilities.APIVersions.Has "apps.openshift.io/v1") (.Values.reloader.isOpenshift) }}
   - apiGroups:
       - "apps.openshift.io"
       - ""
@@ -44,7 +44,7 @@ rules:
       - update
       - patch
 {{- end }}
-{{- if or (.Capabilities.APIVersions.Has "argoproj.io/v1alpha1") (.Values.reloader.isArgoRollouts) }}
+{{- if and (.Capabilities.APIVersions.Has "argoproj.io/v1alpha1") (.Values.reloader.isArgoRollouts) }}
   - apiGroups:
       - "argoproj.io"
       - ""

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -100,10 +100,18 @@ spec:
           httpGet:
             path: /metrics
             port: http
+          timeoutSeconds: {{ .Values.reloader.deployment.livenessProbe.timeoutSeconds | default "5" }}
+          failureThreshold: {{ .Values.reloader.deployment.livenessProbe.failureThreshold | default "5" }}
+          periodSeconds: {{ .Values.reloader.deployment.livenessProbe.periodSeconds | default "10" }}
+          successThreshold: {{ .Values.reloader.deployment.livenessProbe.successThreshold | default "1" }}
         readinessProbe:
           httpGet:
             path: /metrics
             port: http
+          timeoutSeconds: {{ .Values.reloader.deployment.readinessProbe.timeoutSeconds | default "5" }}
+          failureThreshold: {{ .Values.reloader.deployment.readinessProbe.failureThreshold | default "5" }}
+          periodSeconds: {{ .Values.reloader.deployment.readinessProbe.periodSeconds | default "10" }}
+          successThreshold: {{ .Values.reloader.deployment.readinessProbe.successThreshold | default "1" }}
 
       {{- if eq .Values.reloader.readOnlyRootFileSystem true }}
         volumeMounts:

deployments/kubernetes/chart/reloader/templates/role.yaml

@@ -32,7 +32,7 @@ rules:
       - list
       - get
       - watch
-{{- if or (.Capabilities.APIVersions.Has "apps.openshift.io/v1") (.Values.reloader.isOpenshift) }}
+{{- if and (.Capabilities.APIVersions.Has "apps.openshift.io/v1") (.Values.reloader.isOpenshift) }}
   - apiGroups:
       - "apps.openshift.io"
       - ""
@@ -44,7 +44,7 @@ rules:
       - update
       - patch
 {{- end }}
-{{- if or (.Capabilities.APIVersions.Has "argoproj.io/v1alpha1") (.Values.reloader.isArgoRollouts) }}
+{{- if and (.Capabilities.APIVersions.Has "argoproj.io/v1alpha1") (.Values.reloader.isArgoRollouts) }}
   - apiGroups:
       - "argoproj.io"
       - ""

deployments/kubernetes/chart/reloader/values.yaml

@@ -52,10 +52,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v0.0.77
+      version: v0.0.97
     image:
       name: stakater/reloader
-      tag: v0.0.91
+      tag: v0.0.97
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:
@@ -66,6 +66,18 @@ reloader:
       # field supports Key value pair as environment variables. It gets the values from other fields of pod.
       field:
 
+    # Liveness and readiness probe timeout values.
+    livenessProbe: {}
+    #  timeoutSeconds: 5
+    #  failureThreshold: 5
+    #  periodSeconds: 10
+    #  successThreshold: 1
+    readinessProbe: {}
+    #  timeoutSeconds: 15
+    #  failureThreshold: 5
+    #  periodSeconds: 10
+    #  successThreshold: 1
+
     # Specify resource requests/limits for the deployment.
     # Example:
     # resources:

deployments/kubernetes/reloader.yaml

@@ -1,19 +1,34 @@
 ---
+# Source: reloader/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations:
+    meta.helm.sh/release-namespace: "default"
+    meta.helm.sh/release-name: "stakater"
+  labels:
+    app: stakater-reloader
+    chart: "reloader-v0.0.97"
+    release: "stakater"
+    heritage: "Helm"
+    app.kubernetes.io/managed-by: "Helm"
+  name: stakater-reloader
+---
 # Source: reloader/templates/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   annotations:
     meta.helm.sh/release-namespace: "default"
-    meta.helm.sh/release-name: "reloader"
+    meta.helm.sh/release-name: "stakater"
   labels:
-    app: reloader-reloader
-    chart: "reloader-v0.0.77"
-    release: "reloader"
-    heritage: "Tiller"
-    app.kubernetes.io/managed-by: "Tiller"
-  name: reloader-reloader-role
+    app: stakater-reloader
+    chart: "reloader-v0.0.97"
+    release: "stakater"
+    heritage: "Helm"
+    app.kubernetes.io/managed-by: "Helm"
+  name: stakater-reloader-role
   namespace: default
 rules:
   - apiGroups:
@@ -46,33 +61,31 @@ rules:
       - get
       - update
       - patch
-
 ---
 # Source: reloader/templates/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   annotations:
     meta.helm.sh/release-namespace: "default"
-    meta.helm.sh/release-name: "reloader"
+    meta.helm.sh/release-name: "stakater"
   labels:
-    app: reloader-reloader
-    chart: "reloader-v0.0.77"
-    release: "reloader"
-    heritage: "Tiller"
-    app.kubernetes.io/managed-by: "Tiller"
-  name: reloader-reloader-role-binding
+    app: stakater-reloader
+    chart: "reloader-v0.0.97"
+    release: "stakater"
+    heritage: "Helm"
+    app.kubernetes.io/managed-by: "Helm"
+  name: stakater-reloader-role-binding
   namespace: default
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: reloader-reloader-role
+  name: stakater-reloader-role
 subjects:
   - kind: ServiceAccount
-    name: reloader-reloader
+    name: stakater-reloader
     namespace: default
-
 ---
 # Source: reloader/templates/deployment.yaml
 apiVersion: apps/v1
@@ -80,42 +93,40 @@ kind: Deployment
 metadata:
   annotations:
     meta.helm.sh/release-namespace: "default"
-    meta.helm.sh/release-name: "reloader"
+    meta.helm.sh/release-name: "stakater"
   labels:
-    app: reloader-reloader
-    chart: "reloader-v0.0.77"
-    release: "reloader"
-    heritage: "Tiller"
-    app.kubernetes.io/managed-by: "Tiller"
+    app: stakater-reloader
+    chart: "reloader-v0.0.97"
+    release: "stakater"
+    heritage: "Helm"
+    app.kubernetes.io/managed-by: "Helm"
     group: com.stakater.platform
     provider: stakater
-    version: v0.0.77
-    
-  name: reloader-reloader
+    version: v0.0.97
+  name: stakater-reloader
 spec:
   replicas: 1
   revisionHistoryLimit: 2
   selector:
     matchLabels:
-      app: reloader-reloader
-      release: "reloader"
+      app: stakater-reloader
+      release: "stakater"
   template:
     metadata:
       labels:
-        app: reloader-reloader
-        chart: "reloader-v0.0.77"
-        release: "reloader"
-        heritage: "Tiller"
-        app.kubernetes.io/managed-by: "Tiller"
+        app: stakater-reloader
+        chart: "reloader-v0.0.97"
+        release: "stakater"
+        heritage: "Helm"
+        app.kubernetes.io/managed-by: "Helm"
         group: com.stakater.platform
         provider: stakater
-        version: v0.0.77
-        
+        version: v0.0.97
     spec:
       containers:
-      - image: "stakater/reloader:v0.0.77"
+      - image: "stakater/reloader:v0.0.97"
         imagePullPolicy: IfNotPresent
-        name: reloader-reloader
+        name: stakater-reloader
 
         ports:
         - name: http
@@ -124,46 +135,19 @@ spec:
           httpGet:
             path: /metrics
             port: http
+          timeoutSeconds: 5
+          failureThreshold: 5
+          periodSeconds: 10
+          successThreshold: 1
         readinessProbe:
           httpGet:
             path: /metrics
             port: http
+          timeoutSeconds: 5
+          failureThreshold: 5
+          periodSeconds: 10
+          successThreshold: 1
       securityContext: 
         runAsNonRoot: true
         runAsUser: 65534
-        
-      serviceAccountName: reloader-reloader
-
----
-# Source: reloader/templates/role.yaml
-
-
----
-# Source: reloader/templates/rolebinding.yaml
-
-
----
-# Source: reloader/templates/service.yaml
-
-
----
-# Source: reloader/templates/serviceaccount.yaml
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  annotations:
-    meta.helm.sh/release-namespace: "default"
-    meta.helm.sh/release-name: "reloader"
-  labels:
-    app: reloader-reloader
-    chart: "reloader-v0.0.77"
-    release: "reloader"
-    heritage: "Tiller"
-    app.kubernetes.io/managed-by: "Tiller"
-  name: reloader-reloader
-
----
-# Source: reloader/templates/servicemonitor.yaml
-
-
+      serviceAccountName: stakater-reloader