Merge branch 'master' into gcp/feature/bucket-naming-fix
# Conflicts: # .gitlab-ci.yml # devops/gcp/configmap/values.yaml
No related branches found
No related tags found
Pipeline #110848 failed
Showing
- .gitlab-ci.yml 9 additions, 38 deletions.gitlab-ci.yml
- devops/gcp/configmap/templates/configmap-bootstrap.yaml 9 additions, 5 deletionsdevops/gcp/configmap/templates/configmap-bootstrap.yaml
- devops/gcp/configmap/templates/configmap.yml 2 additions, 2 deletionsdevops/gcp/configmap/templates/configmap.yml
- devops/gcp/configmap/values.yaml 3 additions, 2 deletionsdevops/gcp/configmap/values.yaml
- devops/gcp/pipeline/override-stages.yaml 42 additions, 0 deletionsdevops/gcp/pipeline/override-stages.yaml
- provider/wks-gcp/bootstrap/Dockerfile 1 addition, 1 deletionprovider/wks-gcp/bootstrap/Dockerfile
devops/gcp/pipeline/override-stages.yaml
0 → 100644
Please register or sign in to comment