Upgrade version;Disable git rebase/push
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2023-02-13 22:13:22 +01:00
parent 438b40dd53
commit b7a3669681
3 changed files with 11 additions and 11 deletions

View File

@ -23,7 +23,7 @@
- import_tasks: dependencies.yml - import_tasks: dependencies.yml
- import_tasks: k3s.yml - import_tasks: k3s.yml
- import_tasks: helm.yml - import_tasks: helm.yml
- import_tasks: git.yml # - import_tasks: git.yml
- import_tasks: manifests.yml - import_tasks: manifests.yml
- import_tasks: kubeadm.yml - import_tasks: kubeadm.yml
- import_tasks: containerimages.yml - import_tasks: containerimages.yml

View File

@ -110,8 +110,8 @@
- organization: mc - organization: mc
body: body:
name: GitOps.Config name: GitOps.Config
# auto_init: true auto_init: true
# default_branch: main default_branch: main
description: GitOps manifests description: GitOps manifests
- organization: wl - organization: wl
body: body:
@ -122,13 +122,13 @@
loop_control: loop_control:
label: "{{ item.organization ~ '/' ~ item.body.name }}" label: "{{ item.organization ~ '/' ~ item.body.name }}"
- name: Rebase/Push source gitops repository # - name: Rebase/Push source gitops repository
ansible.builtin.shell: # ansible.builtin.shell:
cmd: | # cmd: |
git config --local http.sslVerify false # git config --local http.sslVerify false
git remote set-url origin https://administrator:{{ vapp['metacluster.password'] | urlencode }}@git.{{ vapp['metacluster.fqdn'] }}/mc/GitOps.Config.git # git remote set-url origin https://administrator:{{ vapp['metacluster.password'] | urlencode }}@git.{{ vapp['metacluster.fqdn'] }}/mc/GitOps.Config.git
git push # git push
chdir: /opt/metacluster/git-repositories/gitops # chdir: /opt/metacluster/git-repositories/gitops
when: (gitea_existing_config.json is undefined) or (gitea_existing_config.json.data | length == 0) when: (gitea_existing_config.json is undefined) or (gitea_existing_config.json.data | length == 0)

View File

@ -56,7 +56,7 @@ components:
argo-cd: argo-cd:
helm: helm:
version: 5.20.3 # (= ArgoCD v2.6.1) version: 5.20.4 # (= ArgoCD v2.6.1)
chart: argo/argo-cd chart: argo/argo-cd
parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
chart_values: !unsafe | chart_values: !unsafe |