diff --git a/USERS.md b/USERS.md index af13b3a7b6337..62c155f9dc405 100644 --- a/USERS.md +++ b/USERS.md @@ -173,6 +173,7 @@ Currently, the following organizations are **officially** using Argo CD: 1. [Smilee.io](https://smilee.io) 1. [Snapp](https://snapp.ir/) 1. [Snyk](https://snyk.io/) +1. [Softway Medical](https://www.softwaymedical.fr/) 1. [South China Morning Post (SCMP)](https://www.scmp.com/) 1. [Speee](https://speee.jp/) 1. [Spendesk](https://spendesk.com/) diff --git a/resource_customizations/apps.openshift.io/DeploymentConfig/health.lua b/resource_customizations/apps.openshift.io/DeploymentConfig/health.lua index 6270802a72d2e..3be1879532158 100644 --- a/resource_customizations/apps.openshift.io/DeploymentConfig/health.lua +++ b/resource_customizations/apps.openshift.io/DeploymentConfig/health.lua @@ -3,7 +3,7 @@ if obj.status ~= nil then if obj.status.conditions ~= nil and obj.status.replicas ~= nil then numTrue = 0 for i, condition in pairs(obj.status.conditions) do - if (condition.type == "Available" or condition.type == "Progressing") and condition.status == "True" then + if (condition.type == "Available" or (condition.type == "Progressing" and condition.reason == "NewReplicationControllerAvailable")) and condition.status == "True" then numTrue = numTrue + 1 end end diff --git a/resource_customizations/apps.openshift.io/DeploymentConfig/health_test.yaml b/resource_customizations/apps.openshift.io/DeploymentConfig/health_test.yaml index 46ebdb94c507a..cd38c4ba9657a 100644 --- a/resource_customizations/apps.openshift.io/DeploymentConfig/health_test.yaml +++ b/resource_customizations/apps.openshift.io/DeploymentConfig/health_test.yaml @@ -3,6 +3,10 @@ tests: status: Progressing message: "replication controller is waiting for pods to run" inputPath: testdata/progressing.yaml +- healthStatus: + status: Progressing + message: "replication controller is waiting for pods to run" + inputPath: testdata/progressing_rc_updated.yaml - healthStatus: status: Degraded message: "Deployment config is degraded" diff --git a/resource_customizations/apps.openshift.io/DeploymentConfig/testdata/progressing_rc_updated.yaml b/resource_customizations/apps.openshift.io/DeploymentConfig/testdata/progressing_rc_updated.yaml new file mode 100644 index 0000000000000..84953445c65fd --- /dev/null +++ b/resource_customizations/apps.openshift.io/DeploymentConfig/testdata/progressing_rc_updated.yaml @@ -0,0 +1,66 @@ +kind: DeploymentConfig +apiVersion: apps.openshift.io/v1 +metadata: + name: example + namespace: default +spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + resources: {} + activeDeadlineSeconds: 21600 + triggers: + - type: ConfigChange + replicas: 3 + revisionHistoryLimit: 10 + test: false + selector: + app: httpd + template: + metadata: + creationTimestamp: null + labels: + app: httpd + spec: + containers: + - name: httpd + image: >- + image-registry.openshift-image-registry.svc:5000/openshift/httpd:latest + ports: + - containerPort: 8080 + protocol: TCP + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +status: + observedGeneration: 1 + details: + message: config change + causes: + - type: ConfigChange + availableReplicas: 3 + conditions: + - type: Available + status: 'True' + lastUpdateTime: '2021-08-25T23:48:29Z' + lastTransitionTime: '2021-08-25T23:48:29Z' + message: Deployment config has minimum availability. + - type: Progressing + status: 'True' + lastUpdateTime: '2021-08-25T23:48:29Z' + lastTransitionTime: '2021-08-25T23:48:15Z' + reason: ReplicationControllerUpdated + message: replication controller "example-1" is progressing + replicas: 3 + readyReplicas: 3 \ No newline at end of file