diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index e0f3937f..020ba918 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -5,7 +5,9 @@ permissions: on: push: - branches: ['release/*'] + branches: ["release/*"] + pull_request: + branches: ["release/*"] release: types: [published] workflow_dispatch: diff --git a/src/alert-manager/build/alertmanager.common.dockerfile b/src/alert-manager/build/alertmanager.common.dockerfile new file mode 100644 index 00000000..2a06ee77 --- /dev/null +++ b/src/alert-manager/build/alertmanager.common.dockerfile @@ -0,0 +1,4 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. + +FROM prom/alertmanager:v0.29.0 diff --git a/src/alert-manager/deploy/alert-manager-deployment.yaml.template b/src/alert-manager/deploy/alert-manager-deployment.yaml.template index 9a6c79c5..eeb27474 100755 --- a/src/alert-manager/deploy/alert-manager-deployment.yaml.template +++ b/src/alert-manager/deploy/alert-manager-deployment.yaml.template @@ -42,6 +42,7 @@ spec: containers: - name: alertmanager image: {{ cluster_cfg['cluster']['docker-registry']['prefix'] }}alertmanager:{{ cluster_cfg['cluster']['docker-registry']['tag'] }} + imagePullPolicy: Always args: - '--config.file=/etc/alertmanager/config.yml' - '--storage.path=/alertmanager' diff --git a/src/alert-manager/deploy/redis-deployment.yaml.template b/src/alert-manager/deploy/redis-deployment.yaml.template index 680007f2..0b315679 100644 --- a/src/alert-manager/deploy/redis-deployment.yaml.template +++ b/src/alert-manager/deploy/redis-deployment.yaml.template @@ -72,6 +72,8 @@ spec: periodSeconds: 10 successThreshold: 1 failureThreshold: 3 + imagePullSecrets: + - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }} volumes: - name: redis-data hostPath: @@ -79,4 +81,4 @@ spec: type: "" - name: redis-config configMap: - name: redis-config \ No newline at end of file + name: redis-config diff --git a/src/copilot-chat/deploy/copilot-chat-deployment.yaml.template b/src/copilot-chat/deploy/copilot-chat-deployment.yaml.template index 194014c7..a57e769d 100644 --- a/src/copilot-chat/deploy/copilot-chat-deployment.yaml.template +++ b/src/copilot-chat/deploy/copilot-chat-deployment.yaml.template @@ -101,6 +101,8 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 + imagePullSecrets: + - name: {{ cluster_cfg["cluster"]["docker-registry"]["secret-name"] }} volumes: - name: copilot-chat-logs emptyDir: {} diff --git a/src/log-manager/src/nginx/get_log_content.lua b/src/log-manager/src/nginx/get_log_content.lua index c1ad8f55..99f1a9c9 100644 --- a/src/log-manager/src/nginx/get_log_content.lua +++ b/src/log-manager/src/nginx/get_log_content.lua @@ -70,12 +70,12 @@ end local log_path = log_dir..log_name local use_remote_log_dir = false -if path.isdir(log_path) and util.is_directory_empty(log_path) then +if path.isdir(log_path) and util.is_directory_empty(log_path) and remote_log_dir then ngx.log(ngx.INFO, "falling back to remote log directory") log_path = remote_log_dir..log_name log_dir = remote_log_dir use_remote_log_dir = true -elseif not path.exists(log_path) then +elseif not path.exists(log_path) and remote_log_dir then ngx.log(ngx.INFO, "path not exist, falling back to remote log directory") log_path = remote_log_dir..log_name log_dir = remote_log_dir @@ -120,3 +120,4 @@ else ngx.req.set_uri("/~/current/"..string.sub(path.abspath(log_path), string.len(file_prefix) + 1), true) end +