Merge pull request #59 from harness/release/776xx

release/776xx
harness · Jan 18, 2023 · 6785ad6 · 6785ad6
2 parents 7e71af1 + e042dcd
commit 6785ad6
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/docker-compose/harness/docker-compose.yml b/docker-compose/harness/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   ng-ui:
-    image: harness/nextgenui-signed:0.323.9
+    image: harness/nextgenui-signed:0.331.16
     deploy:
       resources:
         limits:
@@ -17,7 +17,7 @@ services:
       harness-network:
 
   ng-auth-ui:
-    image: harness/ng-auth-ui-signed:0.42.2
+    image: harness/ng-auth-ui-signed:0.45.0
     deploy:
       resources:
         limits:
@@ -32,7 +32,7 @@ services:
       harness-network:
 
   manager:
-    image: harness/manager-signed:77116
+    image: harness/manager-signed:77630
     deploy:
       resources:
         limits:
@@ -54,7 +54,7 @@ services:
       harness-network:
 
   ng-manager:
-    image: harness/ng-manager-signed:77116
+    image: harness/ng-manager-signed:77630
     deploy:
       resources:
         limits:
@@ -70,7 +70,7 @@ services:
       harness-network:
 
   pipeline-service:
-    image: harness/pipeline-service-signed:1.11.1
+    image: harness/pipeline-service-signed:1.16.3
     deploy:
       resources:
         limits:
@@ -87,7 +87,7 @@ services:
       harness-network:
 
   platform-service:
-    image: harness/platform-service-signed:77201
+    image: harness/platform-service-signed:77502
     deploy:
       resources:
         limits:
@@ -117,7 +117,7 @@ services:
       harness-network:
 
   scm:
-    image: harness/ci-scm-signed:release-87-ubi
+    image: harness/ci-scm-signed:release-88-ubi
     deploy:
       resources:
         limits:
@@ -130,7 +130,7 @@ services:
       harness-network:
 
   delegate-proxy:
-    image: harness/delegate-proxy-signed:77021
+    image: harness/delegate-proxy-signed:77629
     deploy:
       resources:
         limits:

diff --git a/docker-compose/harness/environment/manager.env b/docker-compose/harness/environment/manager.env
@@ -13,6 +13,8 @@ DELEGATE_DOCKER_IMAGE=harness/delegate:latest
 DELEGATE_GRPC_AUTHORITY=default-authority.harness.io
 DELEGATE_METADATA_URL=http://proxy/storage/wingsdelegates/delegateprod.txt
 DELEGATE_SERVICE_AUTHORITY=default-authority.harness.io
+IMMUTABLE_DELEGATE_DOCKER_IMAGE: harness/delegate:22.12.77629
+UPGRADER_DOCKER_IMAGE: harness/upgrader:latest
 DELEGATE_SERVICE_TARGET=manager:9879
 DELEGATE_TASK_EXPIRY_CHECK_ITERATOR_THREAD_COUNT=2
 DEPLOYMENT_EVENT_LISTENER_COUNT=1

diff --git a/helm/harness/templates/manager.yaml b/helm/harness/templates/manager.yaml
@@ -41,7 +41,11 @@ metadata:
     {{- include "harness.configMap.labels" . | nindent 4 }}
 data:
   ALLOWED_ORIGINS: http://proxy
-  API_URL: http://{{ .Values.harness_host | default "host.docker.internal" }}:{{ .Values.listen_port }}
+  {{ if .Values.harness_host }}
+  API_URL: http://{{ .Values.harness_host }}:{{ .Values.listen_port }}
+  {{ else }}
+  API_URL: http://proxy
+  {{ end }}
   ARTIFACT_COLLECTION_ITERATOR_THREAD_COUNT: '2'
   ATMOSPHERE_BACKEND: REDIS
   BACKGROUND_SCHEDULER_CLUSTERED: 'true'
@@ -54,7 +58,7 @@ data:
   DELEGATE_CAPABILITIES_RECORD_ITERATOR_THREAD_COUNT: '{{ .Values.manager.config.delegate_capabilities_record_iterator_thread_count | default "2" }}'
   DELEGATE_DOCKER_IMAGE: harness/delegate:latest
   DELEGATE_GRPC_AUTHORITY: default-authority.harness.io
-  DELEGATE_GRPC_TARGET: {{ .Values.harness_host | default "host.docker.internal" }}:9879
+  DELEGATE_GRPC_TARGET: {{ .Values.harness_host | default "proxy" }}:9879
   DELEGATE_METADATA_URL: http://proxy/storage/wingsdelegates/delegateprod.txt
   DELEGATE_SERVICE_AUTHORITY: default-authority.harness.io
   DELEGATE_SERVICE_TARGET: manager:9879
@@ -78,11 +82,17 @@ data:
   GRAPHQL_ENABLED: 'false'
   HARNESS_ENABLE_NG_AUTH_UI_PLACEHOLDER: 'true'
   INSTANCE_SYNC_ITERATOR_THREAD_COUNT: '2'
+  IMMUTABLE_DELEGATE_DOCKER_IMAGE: harness/delegate:23.01.77629
+  UPGRADER_DOCKER_IMAGE: harness/upgrader:latest
   JAVA_ADVANCED_FLAGS: -XX:-TieredCompilation
   LICENSE_INFO: trialLicense
   LOGGERS: org.reflections.Reflections=ERROR
   LOGGING_LEVEL: WARN
-  LOG_STREAMING_SERVICE_BASEURL: http://{{ .Values.harness_host | default "host.docker.internal" }}:{{ .Values.listen_port }}/log-service/
+  {{ if .Values.harness_host }}
+  LOG_STREAMING_SERVICE_BASEURL: http://{{ .Values.harness_host }}:{{ .Values.listen_port }}/log-service/
+  {{ else }}
+  LOG_STREAMING_SERVICE_BASEURL: http://proxy/log-service/
+  {{ end }}
   LOG_STREAMING_SERVICE_TOKEN: c76e567a-b341-404d-a8dd-d9738714eb82
   MEMORY: '{{ .Values.manager.config.memory }}'
   NG_MANAGER_BASE_URL: http://proxy/ng/api/
@@ -99,7 +109,7 @@ data:
   SERVER_PORT: '9090'
   SERVICE_ACC: /opt/harness/svc/service_acc.json
   SETTING_ATTRIBUTE_VALIDATE_CONNECTIVITY_ITERATOR_THREAD_COUNT: '2'
-  UI_SERVER_URL: http://{{ .Values.harness_host | default "host.docker.internal" }}:{{ .Values.listen_port }}
+  UI_SERVER_URL: http://{{ .Values.harness_host | default "proxy" }}:{{ .Values.listen_port }}
   VAULT_SECRET_MANAGER_ITERATOR_THREAD_COUNT: '2'
   VERSION: 1.0.{{ .Values.versions.manager }}
   WATCHER_METADATA_URL: http://proxy/storage/wingswatchers/watcherprod.txt

diff --git a/helm/harness/values.yaml b/helm/harness/values.yaml
@@ -48,16 +48,16 @@ secret:
 versions:
   busybox: 1.35.0
   log_service: release-18
-  manager: 77116
+  manager: 77630
   mongo: 4.2.19
-  ng_auth_ui: 0.42.2
-  ng_ui: 0.323.9
+  ng_auth_ui: 0.45.0
+  ng_ui: 0.331.16
   nginx: 1.21.4
   redis: 6.2.7-alpine
-  scm: release-75-ubi
-  platform_service: 77201
-  delegate_proxy: 77021
-  pipeline_service: 1.11.1
+  scm: release-88-ubi
+  platform_service: 77502
+  delegate_proxy: 77629
+  pipeline_service: 1.16.3
 
 # Resource request & limit configuration per application
 ng_ui:
@@ -113,7 +113,7 @@ pipeline:
 
 platform:
   config:
-    memory: 60
+    memory: 200
   resources:
     limits:
       memory: 300Mi