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.

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

Release/763xx #54

Merged
merged 6 commits into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions docker-compose/harness/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.7"

services:
ng-ui:
image: harness/nextgenui-signed:0.300.25
image: harness/nextgenui-signed:0.318.6
deploy:
resources:
limits:
Expand All @@ -17,7 +17,7 @@ services:
harness-network:

ng-auth-ui:
image: harness/ng-auth-ui-signed:0.36.1
image: harness/ng-auth-ui-signed:0.42.0
deploy:
resources:
limits:
Expand All @@ -32,7 +32,7 @@ services:
harness-network:

manager:
image: harness/manager-signed:75281
image: harness/manager-signed:76620
deploy:
resources:
limits:
Expand All @@ -48,13 +48,13 @@ services:
- '9090'
- '9879'
healthcheck:
test: "wget -q -O - http://localhost:9090/api/health"
test: "curl -s http://localhost:9090/api/health"
start_period: 5m
networks:
harness-network:

ng-manager:
image: harness/ng-manager-signed:75281
image: harness/ng-manager-signed:76620
deploy:
resources:
limits:
Expand All @@ -64,13 +64,13 @@ services:
expose:
- '7090'
healthcheck:
test: "wget -q -O - http://localhost:7090/health"
test: "curl -s http://localhost:7090/health"
start_period: 5m
networks:
harness-network:

pipeline-service:
image: harness/pipeline-service-signed:75281
image: harness/pipeline-service-signed:1.6.0
deploy:
resources:
limits:
Expand All @@ -81,13 +81,13 @@ services:
- '12011'
- '14002'
healthcheck:
test: "wget -q -O - http://localhost:12001/api/health"
test: "curl -s http://localhost:12001/api/health"
start_period: 5m
networks:
harness-network:

platform-service:
image: harness/platform-service-signed:75202
image: harness/platform-service-signed:76600
deploy:
resources:
limits:
Expand All @@ -96,7 +96,7 @@ services:
expose:
- '9005'
healthcheck:
test: "wget -q -O - http://localhost:9005/api/health"
test: "curl -s http://localhost:9005/api/health"
start_period: 5m
networks:
harness-network:
Expand All @@ -117,7 +117,7 @@ services:
harness-network:

scm:
image: harness/ci-scm-signed:release-45
image: harness/ci-scm-signed:release-76-ubi
deploy:
resources:
limits:
Expand All @@ -130,7 +130,7 @@ services:
harness-network:

delegate-proxy:
image: harness/delegate-proxy-signed:75275a
image: harness/delegate-proxy-signed:76614
deploy:
resources:
limits:
Expand Down Expand Up @@ -168,7 +168,7 @@ services:
- ./scripts/wait-for-it.sh:/bin/wait-for-it.sh

redis:
image: harness/redis:6.2.5-alpine
image: harness/redis:6.2.7-alpine
deploy:
resources:
limits:
Expand All @@ -181,7 +181,7 @@ services:
harness-network:

mongo:
image: harness/mongo:4.2.8
image: harness/mongo:4.2.19
deploy:
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion helm/harness/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: harness
version: 0.1.0
appVersion: "75281"
appVersion: "76324"
description: A Helm chart for Harness Community Edition.

type: application
Expand Down
2 changes: 1 addition & 1 deletion helm/harness/templates/delegate-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
serviceAccountName: {{ include "harness.serviceAccountName" . }}
securityContext:
runAsUser: 101
runAsUser: 65534
containers:
- image: harness/delegate-proxy-signed:{{ .Values.versions.delegate_proxy }}
imagePullPolicy: IfNotPresent
Expand Down
14 changes: 4 additions & 10 deletions helm/harness/templates/mongodb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -429,22 +429,16 @@ spec:
- --keyFile=/data/configdb/key.txt
- --wiredTigerCacheSizeGB={{ .Values.mongo.resources.requests.wiredTigerCacheSize }}
livenessProbe:
exec:
command:
- mongo
- --eval
- "db.adminCommand('ping')"
tcpSocket:
port: 27017
initialDelaySeconds: 30
timeoutSeconds: 5
failureThreshold: 3
periodSeconds: 10
successThreshold: 1
readinessProbe:
exec:
command:
- mongo
- --eval
- "db.adminCommand('ping')"
tcpSocket:
port: 27017
initialDelaySeconds: 5
timeoutSeconds: 1
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion helm/harness/templates/ng-auth-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
image: harness/ng-auth-ui-signed:{{ .Values.versions.ng_auth_ui }}
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 101
runAsUser: 65534
runAsNonRoot: true
readinessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion helm/harness/templates/ng-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
image: harness/nextgenui-signed:{{ .Values.versions.ng_ui }}
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 101
runAsUser: 65534
runAsNonRoot: true
readinessProbe:
httpGet:
Expand Down
28 changes: 14 additions & 14 deletions helm/harness/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,36 +46,36 @@ secret:

# Harness application versions
versions:
busybox: 1.33.1
busybox: 1.35.0
log_service: release-18
manager: 75281
mongo: 4.2.8
ng_auth_ui: 0.36.1
ng_ui: 0.300.25
manager: 76620
mongo: 4.2.19
ng_auth_ui: 0.42.0
ng_ui: 0.318.6
nginx: 1.21.4
redis: 6.2.5-alpine
scm: release-45
platform_service: 75202
delegate_proxy: 75275a
pipeline_service: 75281
redis: 6.2.7-alpine
scm: release-75-ubi
platform_service: 76600
delegate_proxy: 76614
pipeline_service: 1.6.0

# Resource request & limit configuration per application
ng_ui:
resources:
limits:
memory: 16Mi
memory: 32Mi
cpu: 200m
requests:
memory: 16Mi
memory: 32Mi
cpu: 200m

ng_auth_ui:
resources:
limits:
memory: 12Mi
memory: 24Mi
cpu: 200m
requests:
memory: 12Mi
memory: 24Mi
cpu: 200m

manager:
Expand Down