Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5f773a90b |
+7
-23
@@ -118,10 +118,13 @@ steps:
|
|||||||
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
||||||
- git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
|
- git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
|
||||||
- git checkout main
|
- git checkout main
|
||||||
- name: modify deployed image
|
- name: update image version
|
||||||
image: alpine
|
image: alpine
|
||||||
commands:
|
commands:
|
||||||
- sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
|
- mkdir $HOME/bin
|
||||||
|
- wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O $HOME/bin/yq && chmod +x $HOME/bin/yq
|
||||||
|
- sed -i -r "s/(tag:).*/\1\ \"${DRONE_SEMVER}\"/" argocd/wahlrecht/${DRONE_DEPLOY_TO}/overwrite_values.yaml
|
||||||
|
- cd argocd/configserver/${DRONE_DEPLOY_TO} && $HOME/bin/yq '. *= load("overwrite_values.yaml")' default_values.yaml > values.yaml
|
||||||
- name: save modified variable file
|
- name: save modified variable file
|
||||||
image: alpine/git
|
image: alpine/git
|
||||||
environment:
|
environment:
|
||||||
@@ -134,32 +137,13 @@ steps:
|
|||||||
- touch $HOME/.ssh/known_hosts
|
- touch $HOME/.ssh/known_hosts
|
||||||
- chmod 600 $HOME/.ssh/known_hosts
|
- chmod 600 $HOME/.ssh/known_hosts
|
||||||
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
- ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
|
||||||
- git add ansible/inventories/host_vars/api-server/public.yaml
|
- git add argocd/wahlrecht/${DRONE_DEPLOY_TO}/*
|
||||||
- git diff-index --quiet HEAD || git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
|
- git diff-index --quiet HEAD || git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
|
||||||
- git push origin main
|
- git push origin main
|
||||||
- name: deploy image
|
|
||||||
image: plugins/ansible:latest
|
|
||||||
volumes:
|
|
||||||
- name: cache
|
|
||||||
path: /root/.ansible
|
|
||||||
settings:
|
|
||||||
playbook: ansible/deploy_spring.yaml
|
|
||||||
inventory: ansible/inventories/production
|
|
||||||
galaxy: ansible/requirements.yaml
|
|
||||||
galaxy_force: false
|
|
||||||
private_key:
|
|
||||||
from_secret: private_ssh_key
|
|
||||||
vault_password:
|
|
||||||
from_secret: vault_password
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: cache
|
|
||||||
host:
|
|
||||||
path: /var/lib/drone/cache/.ansible
|
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
target:
|
target:
|
||||||
- production
|
- test
|
||||||
event:
|
event:
|
||||||
include:
|
include:
|
||||||
- promote
|
- promote
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ class SpringPolicyEnforcer(private val policyEnforcer: PolicyEnforcer,
|
|||||||
|
|
||||||
private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
|
private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
|
||||||
val enforcementMode = policyEnforcerConfig.enforcementMode
|
val enforcementMode = policyEnforcerConfig.enforcementMode
|
||||||
|
log.debug("Authorize with enforcement mode: [{}]", enforcementMode)
|
||||||
return if (EnforcementMode.DISABLED == enforcementMode) {
|
return if (EnforcementMode.DISABLED == enforcementMode) {
|
||||||
createAuthorizedContext()
|
createAuthorizedContext()
|
||||||
} else policyEnforcer.enforce(request, response)
|
} else policyEnforcer.enforce(request, response)
|
||||||
|
|||||||
Reference in New Issue
Block a user