Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oes3.9 #173

Open
wants to merge 24 commits into
base: oes3.9
Choose a base branch
from
Open

Oes3.9 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
abf2c1d
Fixed S3 file copy defect
Jun 21, 2021
109f38c
Ensured that oes-config runs last
Jun 23, 2021
0034a9c
Merge branch 'OpsMx:master' into master
ksrinimba Jun 28, 2021
3574846
Merge branch 'OpsMx:master' into master
ksrinimba Jun 28, 2021
5b0817c
Changes for pipeline promotion
Jun 30, 2021
f7c01f7
Merge branch 'OpsMx:master' into master
ksrinimba Jun 30, 2021
c9f849a
Added git sample
Jun 30, 2021
72ba4a9
Removeing temp file
Jun 30, 2021
28fa879
edit sample
Jun 30, 2021
0166381
Give permissions to all for openshift
Jun 30, 2021
b8fbecd
more permissions
Jun 30, 2021
0527c57
bug fix
Jun 30, 2021
f174015
Made changes as per Abhis comments
Jul 1, 2021
76f67f0
Fixed issue related to git_pr_token being empty
Jul 1, 2021
cba230b
Bumped-up the chart number
Jul 1, 2021
58e30c3
Merge branch 'OpsMx:master' into master
ksrinimba Jul 5, 2021
542399f
Changes for Pipeline-promot in non-gitops
Jul 11, 2021
3a8c82e
migration script from v3.8.x to v3.9
Pranav-b-7 Jul 29, 2021
03147f5
Merge pull request #169 from OpsMx/OP-7058
girichinna27 Jul 29, 2021
c67425a
OP-7058: Added sapor db migration table alter for cloud configuration…
sudhakaropsmx Jul 30, 2021
3f4588a
Made some changes
Pranav-b-7 Jul 30, 2021
abbe710
Merge pull request #171 from OpsMx/OP-7058-new
girichinna27 Jul 30, 2021
ad1c831
Merge branch 'OpsMx:master' into master
ksrinimba Aug 5, 2021
ca6de27
Merge branch 'OpsMx:oes3.9' into oes3.9
ksrinimba Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 34 additions & 112 deletions charts/oes/charts/spinnaker/config/orca-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
pollers:
oldPipelineCleanup:
enabled: true # This enables old pipeline execution cleanup (default: false)
intervalMs: 3600000 # How many milliseconds between pipeline cleanup runs (default: 1hr or 3600000)
thresholdDays: 30 # How old a pipeline execution must be to be deleted (default: 30)
minimumPipelineExecutions: 5 # How many executions to keep around (default: 5)

tasks:
daysOfExecutionHistory: 180 # How many days to keep old task executions around.

job:
preconfigured:
kubernetes:
Expand Down Expand Up @@ -38,6 +48,8 @@ job:
volumeMounts:
- mountPath: /home/opsmx/scripts
name: pipe-promot-scripts
- mountPath: /home/opsmx/config
name: pipe-promot-config
- mountPath: /home/opsmx/.spin
name: spin-cli-config
env:
Expand All @@ -47,67 +59,21 @@ job:
value: 'will be replaced'
- name: command
value: 'upload'
- name: git_friendly_username
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_friendly_username
- name: git_friendly_username
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_friendly_username
- name: git_project
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_project
- name: git_refresh_enabled
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_refresh_enabled
- name: git_repo
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_repo
- name: git_user_email
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_user_email
- name: ignore_spin_errors
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: ignore_spin_errors
- name: git_secret_token
valueFrom:
secretKeyRef:
name: git-token
key: git_secret_token
- name: debug
- name: git_pr_token
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: debug
- name: pipelineconfig
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelineconfig
- name: pipelineconfigdir
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelineconfigdir
- name: pipelinecreateconf
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelinecreateconf
secretKeyRef:
name: git-token
key: git_pr_token
volumes:
- configMap:
defaultMode: 420
name: pipe-promot-config
name: pipe-promot-config
- configMap:
defaultMode: 420
name: pipe-promot-scripts
Expand Down Expand Up @@ -155,6 +121,8 @@ job:
volumeMounts:
- mountPath: /home/opsmx/scripts
name: pipe-promot-scripts
- mountPath: /home/opsmx/config
name: pipe-promot-config
- mountPath: /home/opsmx/.spin
name: spin-cli-config
env:
Expand All @@ -164,67 +132,21 @@ job:
value: 'will be replaced'
- name: command
value: 'download'
- name: git_friendly_username
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_friendly_username
- name: git_friendly_username
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_friendly_username
- name: git_project
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_project
- name: git_refresh_enabled
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_refresh_enabled
- name: git_repo
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_repo
- name: git_user_email
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: git_user_email
- name: ignore_spin_errors
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: ignore_spin_errors
- name: git_secret_token
valueFrom:
secretKeyRef:
name: git-token
key: git_secret_token
- name: debug
- name: git_pr_token
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: debug
- name: pipelineconfig
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelineconfig
- name: pipelineconfigdir
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelineconfigdir
- name: pipelinecreateconf
valueFrom:
configMapKeyRef:
name: pipe-promot-config
key: pipelinecreateconf
secretKeyRef:
name: git-token
key: git_pr_token
volumes:
- configMap:
defaultMode: 420
name: pipe-promot-config
name: pipe-promot-config
- configMap:
defaultMode: 420
name: pipe-promot-scripts
Expand All @@ -241,7 +163,7 @@ job:
cloudProvider: kubernetes
account: default
waitForCompletion: true
application: spin
application: sampleapp
parameters:
- defaultValue: "http://oes-sapor:8085"
description: Please enter the POLICY Proxy Hostname and Port
Expand Down Expand Up @@ -308,7 +230,7 @@ job:
restartPolicy: Never
- label: VerificationGate
cloudProvider: kubernetes
application: spin
application: sampleapp
description: Stage for Verification Gate
propertyFile: verificationgate
account: default
Expand Down Expand Up @@ -414,7 +336,7 @@ job:
- label: VisibilityApproval
cloudProvider: kubernetes
credentials: default
application: spin
application: sampleapp
description: Stage for Visibility Approval
propertyFile: visibilityapprove
account: default
Expand Down Expand Up @@ -548,7 +470,7 @@ job:
restartPolicy: Never
- label: TestVerification
cloudProvider: kubernetes
application: spin
application: sampleapp
description: Stage for TestVerification
propertyFile: testverification
account: default
Expand Down
3 changes: 3 additions & 0 deletions charts/oes/templates/pipeline-promotion/git-token-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@ stringData:
kind: Secret
metadata:
name: git-token
{{- if not .Values.spinnaker.gitopsHalyard.enabled }}
namespace: default
{{- end }}
type: Opaque
{{- end }}
4 changes: 4 additions & 0 deletions charts/oes/templates/pipeline-promotion/local-spin-cli-config-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ stringData:
kind: Secret
metadata:
name: local-spin-cli-config
{{- if not .Values.spinnaker.gitopsHalyard.enabled }}
namespace: default
{{- end }}

{{- end }}
5 changes: 4 additions & 1 deletion charts/oes/templates/pipeline-promotion/pipe-promot-config-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,8 @@ data:
#git_secret_sshkey={{ .Values.spinnaker.gitopsHalyard.pipelinePromotion.secret_sshkey }}
kind: ConfigMap
metadata:
creationTimestamp: null
name: pipe-promot-config
{{- if not .Values.spinnaker.gitopsHalyard.enabled }}
namespace: default
{{- end }}

4 changes: 4 additions & 0 deletions charts/oes/templates/pipeline-promotion/pipe-promot-scripts-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,3 +570,7 @@ data:
kind: ConfigMap
metadata:
name: pipe-promot-scripts
{{- if not .Values.spinnaker.gitopsHalyard.enabled }}
namespace: default
{{- end }}

3 changes: 3 additions & 0 deletions charts/oes/templates/pipeline-promotion/spin-cli-config-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ stringData:
kind: Secret
metadata:
name: spin-cli-config
{{- if not .Values.spinnaker.gitopsHalyard.enabled }}
namespace: default
{{- end }}
{{- end }}
Loading