Merge branch '81-mistake-in-cronjob' into 'master'

Resolve "Mistake in cronjob"

Closes #81

See merge request openappstack/single-sign-on!45

helmchart/single-sign-on/Chart.yaml

 apiVersion: v1
 description: A Helm chart for OpenAppStack's Signle sign-on components
 name: single-sign-on
-version: 0.2.2
+version: 0.2.11

helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml

@@ -50,7 +50,7 @@ spec:
               value: "{{- range .grantTypes }}\"{{ . }}\",{{- end }}"
             command: ["/bin/bash", "-c"]
             args:
-            - >
+            - |
               curl http://{{ $.Release.Name }}-hydra-admin:4445/health/ready \
                   --silent \
                   --write-out "\nCheck Hydra health: HTTP %{http_code}" \

helmchart/single-sign-on/templates/deployment-consent.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ include "single-sign-on.fullname" . }}-consent
   labels:
-{{ include "single-sign-on.labels" . | indent 4 }}
+    {{- include "single-sign-on.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector:

helmchart/single-sign-on/templates/deployment-userbackend.yaml

@@ -4,7 +4,9 @@ metadata:
   name: {{ include "single-sign-on.fullname" . }}-userbackend
   labels:
     {{- include "single-sign-on.labels" . | nindent 4 }}
+    {{- if .Values.userbackend.deploymentLabels }}
     {{- toYaml .Values.userbackend.deploymentLabels | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   selector:
@@ -14,7 +16,9 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: {{ include "single-sign-on.name" . }}-userbackend
+        {{- if .Values.userbackend.podLabels }}
         {{- toYaml .Values.userbackend.podLabels | nindent 8 }}
+        {{- end }}
       annotations:
         {{- toYaml .Values.userbackend.podAnnotations | nindent 8 }}
     spec:

helmchart/single-sign-on/templates/job-create-oauth-clients.yaml

@@ -51,9 +51,8 @@ spec:
           value: "{{- range .grantTypes }}\"{{ . }}\",{{- end }}"
         command: ["/bin/bash", "-c"]
         args:
-        - >
-          curl http://{{ $.Release.Name }}-hydra-admin:4445/clients &&
-          curl --header "Content-Type: application/json" \
+        - |
+          curl http://{{ $.Release.Name }}-hydra-admin:4445/clients && curl --header "Content-Type: application/json" \
                --request POST \
                --data "{\"client_id\": \"$CLIENT_ID\",
                         \"client_name\": \"$CLIENT_NAME\",

helmchart/single-sign-on/values.yaml

@@ -3,31 +3,34 @@ consentProvider:
     # consentProvider.image.tag and consentProvider.image.pullPolicy should be the same as
     # loginProvider.image.tag and loginProvider.image.pullPolicy as the images are released
     # together in order to guarantee compatibility
-    << : &IMAGE_DEFAULTS_SSO { tag: "master", pullPolicy: "Always" }
+    tag: "master"
+    pullPolicy: "Always"
     repository: "open.greenhost.net:4567/openappstack/single-sign-on/consent_provider"
   podAnnotations: {}
 
 loginProvider:
   image:
-    << : *IMAGE_DEFAULTS_SSO
+    tag: "master"
+    pullPolicy: "Always"
     repository: "open.greenhost.net:4567/openappstack/single-sign-on/login_provider"
   podAnnotations: {}
 
 # singleSignOnHost is the FQDN that will be used by the ingress to make the consent and
 # the login provider accessible by user agents. For now it is recommended to set it to the
 # same value as hydra.ingress.public.hosts[0].host
-singleSignOnHost: &SSO_HOST sso.oas.example.net
+singleSignOnHost: sso.oas.example.net
 
 userpanel:
   # userpanel.applicationName is the name of the application. This is a duplicate of
   # userbackend.applications[0].name but helm < 3.0 doesn't supprt direct references to
   # list items in template files so we need to keep it for now
-  applicationName: &USER_PANEL user-panel
+  applicationName: user-panel
   image:
     # userpanel.image.tag and userpanel.image.pullPolicy should be the same as
     # userbackend.image.tag and userpanel.image.pullPolicy as the images are released
     # together in order to guarantee compatibility
-    << : &IMAGE_DEFAULTS_USER_PANEL { tag: "master", pullPolicy: "Always" }
+    tag: "master"
+    pullPolicy: "Always"
     repository: "open.greenhost.net:4567/openappstack/user-panel/frontend"
   ingress:
     # userpanel.ingress.host is the FQDN of the userpanel application
@@ -36,13 +39,14 @@ userpanel:
 
 userbackend:
   image:
-    << : *IMAGE_DEFAULTS_USER_PANEL
+    tag: "master"
+    pullPolicy: "Always"
     repository: "open.greenhost.net:4567/openappstack/user-panel/backend"
   # userbackend.username is the username of the admin user that will be create
   # after the installation of the user backend.
   username: "admin"
   applications:
-    - name: *USER_PANEL
+    - name: user-panel
       description: Administration interface to manage user accounts
   # username.password is the password of the admin user
   password: "YouReallyNeedToChangeThis"
@@ -103,13 +107,13 @@ hydra:
       hosts:
         # hydra.ingress.public.hosts[0].hosts.host is the FQDN of the single sign-on system
         # that will be used by oAuth clients to retrieve userinfo and redirect their users to.
-        - host: *SSO_HOST
+        - host: sso.oas.example.net
           paths: ["/"]
       tls:
         # oAuth2 only works via https. You really need to configure your ingress service to
         # provide access to hydra via https.
         - hosts:
-          - *SSO_HOST
+          - sso.oas.example.net
           secretName: hydra-public.tls
     # hydra.ingress.admin is the ingress resource that controls access to the hydra
     # admin API server. It can be activated using the same options as in
@@ -123,7 +127,7 @@ hydra:
 oAuthClients:
   # oauthClients[].clientName is the name of the oauth client that needs to be the same as
   # the application name in userbackend.applications[].name
-- clientName: *USER_PANEL
+- clientName: user-panel
   # oauthClients[].clientSecret is the secret the client uses to authenticate
   clientSecret: "YouReallyNeedToChangeThis"
   # oAuthClients[].redirectUri is the url the user will be redirected to by hydra when the