Skip to content

Commit b4c4352

Browse files
ATGardnerATGardner
authored
CR-18274-fix-ap-restart (#34)
* added partOfValue and deploymentName env * updated chart version to `0.2.1-alpha.9` * removed unused gitIntegration values * updated app-proxy to `1.2207.0`
1 parent 5dd72d8 commit b4c4352

File tree

11 files changed

+11
-70
lines changed

11 files changed

+11
-70
lines changed

‎charts/gitops-runtime/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: 0.1.27
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.2.1-alpha.8
5+
version: 0.2.1-alpha.9
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
keywords:
88
- codefresh

‎charts/gitops-runtime/README.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# gitops-runtime
22

3-
![Version: 0.2.1-alpha.8](https://img.shields.io/badge/Version-0.2.1--alpha.8-informational?style=flat-square) ![AppVersion: 0.1.27](https://img.shields.io/badge/AppVersion-0.1.27-informational?style=flat-square)
3+
![Version: 0.2.1-alpha.9](https://img.shields.io/badge/Version-0.2.1--alpha.9-informational?style=flat-square) ![AppVersion: 0.1.27](https://img.shields.io/badge/AppVersion-0.1.27-informational?style=flat-square)
44

55
A Helm chart for Codefresh gitops runtime
66

@@ -52,13 +52,13 @@ A Helm chart for Codefresh gitops runtime
5252
| app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
5353
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
5454
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
55-
| app-proxy.image.tag | string | `"1.2193.0"` | |
55+
| app-proxy.image.tag | string | `"1.2207.0"` | |
5656
| app-proxy.imagePullSecrets | list | `[]` | |
5757
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
5858
| app-proxy.initContainer.env | object | `{}` | |
5959
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
6060
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
61-
| app-proxy.initContainer.image.tag | string | `"1.2193.0"` | |
61+
| app-proxy.initContainer.image.tag | string | `"1.2207.0"` | |
6262
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
6363
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
6464
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -123,13 +123,9 @@ A Helm chart for Codefresh gitops runtime
123123
| event-reporters.workflow.sensor.replicas | int | `1` | |
124124
| event-reporters.workflow.sensor.resources | object | `{}` | |
125125
| event-reporters.workflow.serviceAccount.create | bool | `true` | |
126-
| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","gitIntegration":{"provider":{"apiUrl":"https://api.github.com","name":"GITHUB"}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
126+
| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
127127
| global.codefresh.accountId | string | `""` | Codefresh Account ID. |
128128
| global.codefresh.apiEventsPath | string | `"/2.0/api/events"` | Events API endpoint URL suffix. |
129-
| global.codefresh.gitIntegration | object | `{"provider":{"apiUrl":"https://api.github.com","name":"GITHUB"}}` | Git integration for this runtime. Requires the Git provider name and the provider's API URL. |
130-
| global.codefresh.gitIntegration.provider | object | `{"apiUrl":"https://api.github.com","name":"GITHUB"}` | The Git provider to use. We currently support GitHub, GitLab, Bitbucket Server, and Bitbucket Cloud. |
131-
| global.codefresh.gitIntegration.provider.apiUrl | string | `"https://api.github.com"` | Provider API URL. Example for GitHub, https://api.github.com. |
132-
| global.codefresh.gitIntegration.provider.name | string | `"GITHUB"` | Name of the Git provider: BITBUCKET, BITBUCKET_SERVER, GITHUB, GITLAB |
133129
| global.codefresh.url | string | `"https://g.codefresh.io"` | URL of Codefresh platform. |
134130
| global.codefresh.userToken | object | `{"secretKeyRef":{},"token":""}` | User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided. |
135131
| global.codefresh.userToken.secretKeyRef | object | `{}` | User token that references an existing secret containing the token. |

‎charts/gitops-runtime/ci/default-values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ global:
66
name: mysecret
77
key: myvalue
88
optional: true
9-
gitIntegration:
10-
provider:
11-
name: 'GITHUB'
12-
apiUrl: 'https://api.github.com'
139

1410
runtime:
1511
name: default

‎charts/gitops-runtime/ci/ingressless-values.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
global:
22
codefresh:
33
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
4-
gitIntegration:
5-
provider:
6-
name: 'GITHUB'
7-
apiUrl: 'https://api.github.com'
84
userToken:
95
secretKeyRef:
106
name: mysecret

‎charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ CORS:
4040
name: cap-app-proxy-cm
4141
key: cors
4242
optional: true
43+
DEPLOYMENT_NAME: {{ include "cap-app-proxy.fullname" . }}
4344
ENV:
4445
valueFrom:
4546
configMapKeyRef:
@@ -62,6 +63,7 @@ NAMESPACE:
6263
valueFrom:
6364
fieldRef:
6465
fieldPath: metadata.namespace
66+
PART_OF_VALUE: app-proxy
6567
PORT:
6668
valueFrom:
6769
configMapKeyRef:

‎charts/gitops-runtime/templates/_helpers.tpl‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -223,30 +223,6 @@ Output comma separated list of installed runtime components
223223
{{- $comptList | toYaml }}
224224
{{- end }}
225225

226-
# ------------------------------------------------------------------------------------------------------------
227-
# Git integration
228-
------------------------------------------------------------------------------------------------------------
229-
{{- define "codefresh-gitops-runtime.git-integration.provider"}}
230-
{{- if .Values.global.codefresh.gitIntegration.provider.name }}
231-
{{- $supportedProviders := list "GITHUB" "GITLAB" "BITBUCKET" "BITBUCKET_SERVER" }}
232-
{{- if has .Values.global.codefresh.gitIntegration.provider.name $supportedProviders }}
233-
{{- print .Values.global.codefresh.gitIntegration.provider.name }}
234-
{{- else }}
235-
{{ fail (printf "ERROR: Unsupported git provider %s. Currently supported: GITHUB,GITLAB,BITBUCKET,BITBUCKET_SERVER" .Values.global.codefresh.gitIntegration.provider.name)}}
236-
{{- end }}
237-
{{- else }}
238-
{{ fail "Values.global.codefresh.gitIntegration.provider.name is required"}}
239-
{{- end }}
240-
{{- end }}
241-
242-
{{- define "codefresh-gitops-runtime.git-integration.apiUrl"}}
243-
{{- if .Values.global.codefresh.gitIntegration.provider.apiUrl }}
244-
{{- print .Values.global.codefresh.gitIntegration.provider.apiUrl }}
245-
{{- else }}
246-
{{ fail "Values.global.codefresh.gitIntegration.provider.apiUrl is required"}}
247-
{{- end }}
248-
{{- end }}
249-
250226
# ------------------------------------------------------------------------------------------------------------
251227
# runtime git credentials
252228
# ------------------------------------------------------------------------------------------------------------

‎charts/gitops-runtime/templates/app-proxy/_app-proxy-env.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ app-proxy components are generated.
77
HELM_RELEASE_NAME: {{ .Release.Name }}
88
USER_TOKEN:
99
{{- include "codefresh-gitops-runtime.installation-token-env-var-value" . | nindent 2 }}
10-
GIT_INTEGRATION_PROVIDER: {{ include "codefresh-gitops-runtime.git-integration.provider" .}}
11-
{{- if .Values.global.codefresh.gitIntegration.provider.apiUrl }}
12-
GIT_INTEGRATION_APIURL: {{ include "codefresh-gitops-runtime.git-integration.apiUrl" . }}
13-
{{- end }}
1410
{{- if or .Values.global.runtime.gitCredentials.password.value .Values.global.runtime.gitCredentials.password.secretKeyRef }}
1511
GIT_USERNAME: {{ .Values.global.runtime.gitCredentials.username }}
1612
GIT_PASSWORD:
@@ -21,5 +17,4 @@ GIT_PASSWORD:
2117
{{- define "codefresh-gitops-runtime.app-proxy.init-container.calculated-env-vars"}}
2218
USER_TOKEN:
2319
{{- include "codefresh-gitops-runtime.installation-token-env-var-value" . | nindent 2 }}
24-
GIT_INTEGRATION_PROVIDER: {{ include "codefresh-gitops-runtime.git-integration.provider" .}}
25-
{{- end }}
20+
{{- end }}

‎charts/gitops-runtime/tests/values/mandatory-values-ingress.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
global:
22
codefresh:
3-
gitIntegration:
4-
provider:
5-
name: 'GITHUB'
6-
apiUrl: 'https://api.github.com'
73
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
84
userToken:
95
token: 'dummy'

‎charts/gitops-runtime/tests/values/mandatory-values-no-token.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
global:
22
codefresh:
3-
gitIntegration:
4-
provider:
5-
name: 'GITHUB'
6-
apiUrl: 'https://api.github.com'
73
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
84

95
runtime:

‎charts/gitops-runtime/tests/values/mandatory-values.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
global:
22
codefresh:
33
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
4-
gitIntegration:
5-
provider:
6-
name: 'GITHUB'
7-
apiUrl: 'https://api.github.com'
84
userToken:
95
token: 'dummy'
106

@@ -15,4 +11,4 @@ global:
1511
enabled: false
1612

1713
argo-rollouts:
18-
enabled: true
14+
enabled: true

0 commit comments

Comments
 (0)