Skip to content

Commit 1196258

Browse files
filippomcfilippomc
committed
Merge branch 'develop' of github.com:MetaCell/cloud-harness into develop
2 parents 488d351 + ab40421 commit 1196258

23 files changed

Lines changed: 263 additions & 50 deletions

‎deployment-configuration/codefresh-template-prod.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ steps:
3131
commands:
3232
- bash cloud-harness/install.sh
3333
- export HELM_META_ARGS="$( [ -n "${{HARNESS_CHART_NAME}}" ] && printf -- "--name %s " "${{HARNESS_CHART_NAME}}"; [ -n "${{HARNESS_CHART_VERSION}}" ] && printf -- "--chart-version %s " "${{HARNESS_CHART_VERSION}}"; [ -n "${{HARNESS_APP_VERSION}}" ] && printf -- "--app-version %s" "${{HARNESS_APP_VERSION}}" )"
34-
- harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs '${{REGISTRY_SECRET}}' -n ${{NAMESPACE}} -e $ENV --no-cd $HELM_META_ARGS $PARAMS
34+
- harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rsn '${{REGISTRY_SECRET}}' -n ${{NAMESPACE}} -e $ENV --no-cd $HELM_META_ARGS $PARAMS
3535
prepare_deployment_view:
3636
commands:
3737
- "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"

‎deployment-configuration/codefresh-template-stage.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
commands:
3535
- bash cloud-harness/install.sh
3636
- export HELM_META_ARGS="$( [ -n "${{HARNESS_CHART_NAME}}" ] && printf -- "--name %s " "${{HARNESS_CHART_NAME}}"; [ -n "${{HARNESS_CHART_VERSION}}" ] && printf -- "--chart-version %s " "${{HARNESS_CHART_VERSION}}"; [ -n "${{HARNESS_APP_VERSION}}" ] && printf -- "--app-version %s" "${{HARNESS_APP_VERSION}}" )"
37-
- harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV --no-cd $HELM_META_ARGS $PARAMS
37+
- harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rsn ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV --no-cd $HELM_META_ARGS $PARAMS
3838
prepare_deployment_view:
3939
commands:
4040
- "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"

‎deployment-configuration/codefresh-template-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
commands:
3535
- bash cloud-harness/install.sh
3636
- export HELM_META_ARGS="$( [ -n "${{HARNESS_CHART_NAME}}" ] && printf -- "--name %s " "${{HARNESS_CHART_NAME}}"; [ -n "${{HARNESS_CHART_VERSION}}" ] && printf -- "--chart-version %s " "${{HARNESS_CHART_VERSION}}"; [ -n "${{HARNESS_APP_VERSION}}" ] && printf -- "--app-version %s" "${{HARNESS_APP_VERSION}}" )"
37-
- harness-deployment $PATHS -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -e $ENV --write-env --cache-url '${{IMAGE_CACHE_URL}}' -N $HELM_META_ARGS $PARAMS
37+
- harness-deployment $PATHS -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rsn ${{REGISTRY_SECRET}} -e $ENV --write-env --cache-url '${{IMAGE_CACHE_URL}}' -N $HELM_META_ARGS $PARAMS
3838
- cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
3939
- cat ${{CF_VOLUME_PATH}}/env_vars_to_export
4040
prepare_deployment_view:

‎deployment-configuration/helm/templates/auto-deployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
spec:
3333
{{- if and .root.Values.registry.secret (contains .root.Values.registry.name .app.harness.deployment.image) }}
3434
imagePullSecrets:
35-
- name: {{ .root.Values.registry.secret }}
35+
- name: {{ .root.Values.registry.secret.name }}
3636
{{- end }}
3737
{{- if and .app.harness.deployment.volume }}
3838
{{- if or (not (hasKey .app.harness.deployment.volume "usenfs")) (not .app.harness.deployment.volume.usenfs) }}

‎deployment-configuration/helm/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ metadata:
1010
data:
1111
allvalues.yaml: |
1212
{{- $values_copy := deepCopy .Values }}
13+
{{- $registry := get $values_copy "registry" }}
14+
{{- if $registry }}
15+
{{- $secret := get $registry "secret" }}
16+
{{- if and (kindIs "map" $secret) (not (empty $secret.value)) }}
17+
{{- $tmp := set $registry "secret" nil }}
18+
{{- end }}
19+
{{- end }}
1320
{{- range $key, $val := .Values.apps }}
1421
{{- $app := get $values_copy.apps $key }}
1522
{{- $tmp := set $app.harness "secrets" dict }}

‎deployment-configuration/helm/templates/registry-secret.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{- if and .Values.registry.name .Values.registry.secret.name }}
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: {{ .Values.registry.secret.name | quote }}
6+
namespace: {{ .Release.Namespace }}
7+
type: kubernetes.io/dockerconfigjson
8+
stringData:
9+
.dockerconfigjson: |-
10+
{
11+
"auths": {
12+
"{{ .Values.registry.name }}": {
13+
"username": "_json_key",
14+
"password": {{ .Values.registry.secret.value | toJson }},
15+
"auth": "{{ printf "_json_key:%s" .Values.registry.secret.value | b64enc }}"
16+
}
17+
}
18+
}
19+
{{- end }}

‎deployment-configuration/helm/values.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ registry:
1313
name: "localhost:5000"
1414
# -- Optional secret used for pulling from docker registry.
1515
secret:
16+
# -- Secret name used for pulling from docker registry.
17+
name:
18+
# -- Value of the secret used for pulling from docker registry in json encoded format.
19+
value:
1620
# -- Docker tag used to pull images.
1721
tag: latest
1822
# -- List of applications.
@@ -85,4 +89,4 @@ proxy:
8589
requests:
8690
memory: "32Mi"
8791
limits:
88-
memory: "64Mi"
92+
memory: "64Mi"

‎deployment/codefresh-test.yaml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
-- "--chart-version %s " "${{HARNESS_CHART_VERSION}}"; [ -n "${{HARNESS_APP_VERSION}}"
2626
] && printf -- "--app-version %s" "${{HARNESS_APP_VERSION}}" )"
2727
- harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
28-
-rs ${{REGISTRY_SECRET}} -e test --write-env --cache-url '${{IMAGE_CACHE_URL}}'
28+
-rsn ${{REGISTRY_SECRET}} -e test --write-env --cache-url '${{IMAGE_CACHE_URL}}'
2929
-N $HELM_META_ARGS -i samples
3030
- cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
3131
- cat ${{CF_VOLUME_PATH}}/env_vars_to_export
@@ -67,24 +67,24 @@ steps:
6767
accounts:
6868
type: build
6969
stage: build
70-
dockerfile: Dockerfile
70+
dockerfile: infrastructure/base-images/cloudharness-base/Dockerfile
7171
registry: '${{CODEFRESH_REGISTRY}}'
7272
buildkit: true
7373
build_arguments:
7474
- NOCACHE=${{CF_BUILD_ID}}
75-
image_name: cloud-harness/accounts
76-
title: Accounts
77-
working_directory: ./applications/accounts
75+
image_name: cloud-harness/cloudharness-base
76+
title: Cloudharness base
77+
working_directory: ./.
7878
tags:
79-
- '${{ACCOUNTS_TAG}}'
79+
- '${{CLOUDHARNESS_BASE_TAG}}'
8080
- '${{DEPLOYMENT_PUBLISH_TAG}}-dev'
8181
- '${{CF_BRANCH_TAG_NORMALIZED_LOWER_CASE}}'
8282
when:
8383
condition:
8484
any:
85-
buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
85+
buildDoesNotExist: includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
8686
== true
87-
forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
87+
forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
8888
== false
8989
test-e2e:
9090
type: build
@@ -144,12 +144,11 @@ steps:
144144
buildkit: true
145145
build_arguments:
146146
- NOCACHE=${{CF_BUILD_ID}}
147-
- CLOUDHARNESS_BASE=${{REGISTRY}}/cloud-harness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
148-
image_name: cloud-harness/workflows-extract-download
149-
title: Workflows extract download
150-
working_directory: ./applications/workflows/tasks/extract-download
147+
image_name: cloud-harness/accounts
148+
title: Accounts
149+
working_directory: ./applications/accounts
151150
tags:
152-
- '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
151+
- '${{ACCOUNTS_TAG}}'
153152
- '${{DEPLOYMENT_PUBLISH_TAG}}-dev'
154153
- '${{CF_BRANCH_TAG_NORMALIZED_LOWER_CASE}}'
155154
when:
@@ -237,11 +236,11 @@ steps:
237236
build_arguments:
238237
- NOCACHE=${{CF_BUILD_ID}}
239238
- CLOUDHARNESS_BASE=${{REGISTRY}}/cloud-harness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
240-
image_name: cloud-harness/workflows-notify-queue
241-
title: Workflows notify queue
242-
working_directory: ./applications/workflows/tasks/notify-queue
239+
image_name: cloud-harness/cloudharness-flask
240+
title: Cloudharness flask
241+
working_directory: ./infrastructure/common-images/cloudharness-flask
243242
tags:
244-
- '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
243+
- '${{CLOUDHARNESS_FLASK_TAG}}'
245244
- '${{DEPLOYMENT_PUBLISH_TAG}}-dev'
246245
- '${{CF_BRANCH_TAG_NORMALIZED_LOWER_CASE}}'
247246
when:
@@ -372,28 +371,29 @@ steps:
372371
== true
373372
forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
374373
== false
375-
volumemanager:
374+
samples:
376375
type: build
377376
stage: build
378377
dockerfile: Dockerfile
379378
registry: '${{CODEFRESH_REGISTRY}}'
380379
buildkit: true
381380
build_arguments:
382381
- NOCACHE=${{CF_BUILD_ID}}
382+
- CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloud-harness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
383383
- CLOUDHARNESS_FLASK=${{REGISTRY}}/cloud-harness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
384-
image_name: cloud-harness/volumemanager
385-
title: Volumemanager
386-
working_directory: ./applications/volumemanager/server
384+
image_name: cloud-harness/sampleapp
385+
title: Samples
386+
working_directory: ./applications/samples
387387
tags:
388-
- '${{VOLUMEMANAGER_TAG}}'
388+
- '${{SAMPLES_TAG}}'
389389
- '${{DEPLOYMENT_PUBLISH_TAG}}-dev'
390390
- '${{CF_BRANCH_TAG_NORMALIZED_LOWER_CASE}}'
391391
when:
392392
condition:
393393
any:
394-
buildDoesNotExist: includes('${{VOLUMEMANAGER_TAG_EXISTS}}', '{{VOLUMEMANAGER_TAG_EXISTS}}')
394+
buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
395395
== true
396-
forceNoCache: includes('${{VOLUMEMANAGER_TAG_FORCE_BUILD}}', '{{VOLUMEMANAGER_TAG_FORCE_BUILD}}')
396+
forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
397397
== false
398398
workflows:
399399
type: build

‎docs/dev.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ helm_values = create_helm_chart( # <1>
257257
output_path=args.output_path,
258258
exclude=args.exclude,
259259
include=args.include,
260-
registry_secret=args.registry_secret,
260+
registry_secret_name=args.registry_secret_name,
261261
tls=not args.no_tls,
262262
env=envs,
263263
namespace=args.namespace

‎docs/model/RegistryConfig.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Name | Type | Description | Notes
88
------------ | ------------- | ------------- | -------------
99
**name** | **str** | |
10-
**secret** | **str** | Optional secret used for pulling from docker registry. | [optional]
10+
**secret** | [**RegistrySecretConfig**](RegistrySecretConfig.md) | | [optional]
1111

1212
## Example
1313

0 commit comments

Comments
 (0)