Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 65 commits from unstable into master
1 changed files with 25 additions and 21 deletions
Showing only changes of commit 45953d5531 - Show all commits

View File

@ -1,36 +1,40 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
images:
- name: reg.cadoles.com/proxy_cache/oryd/hydra
newTag: v2.1.2
resources: resources:
- ./resources/hydra-deployment.yaml - ./resources/hydra-deployment.yaml
- ./resources/hydra-service.yaml - ./resources/hydra-service.yaml
- ./resources/hydra-role.yaml - ./resources/hydra-role.yaml
- ./resources/hydra-rolebinding.yaml - ./resources/hydra-rolebinding.yaml
- ./resources/hydra-serviceaccount.yaml - ./resources/hydra-serviceaccount.yaml
- ./resources/hydra-migrate-job.yaml - ./resources/hydra-migrate-job.yaml
- ./resources/hydra-maester - ./resources/hydra-maester
- ./resources/hydra-janitor-cronjob.yaml - ./resources/hydra-janitor-cronjob.yaml
secretGenerator: secretGenerator:
- name: hydra-secret - name: hydra-secret
literals: literals:
- SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
configMapGenerator: configMapGenerator:
- name: hydra-env - name: hydra-env
literals: literals:
- URLS_SELF_ISSUER=http://localhost:4444 - URLS_SELF_ISSUER=http://localhost:4444
- URLS_LOGIN=http://hydra-login-app/login - URLS_LOGIN=http://hydra-login-app/login
- URLS_CONSENT=http://hydra-consent-app/consent - URLS_CONSENT=http://hydra-consent-app/consent
- URLS_LOGOUT=http://hydra-logout-app/logout - URLS_LOGOUT=http://hydra-logout-app/logout
- HYDRA_SERVE_ALL_ARGS=--dev - HYDRA_SERVE_ALL_ARGS=--dev
- LOG_LEVEL=info - LOG_LEVEL=info
vars: vars:
- name: HYDRA_MIGRATE_JOB_NAME - name: HYDRA_MIGRATE_JOB_NAME
objref: objref:
name: hydra-migrate name: hydra-migrate
kind: Job kind: Job
apiVersion: batch/v1 apiVersion: batch/v1
fieldref: fieldref:
fieldpath: metadata.name fieldpath: metadata.name