Bump version to 2.0.1

fix: spark application check fails on missing section (#6036 )
2026-03-13 11:58:46 +01:00 · 2021-04-15 22:24:00 +00:00 · 2021-04-15 22:23:46 +00:00 · 2021-04-15 15:18:02 -07:00 · 2021-04-12 14:09:12 -07:00 · 2021-04-12 14:03:55 -07:00
13 changed files with 48 additions and 35 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.0
+2.0.1
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.0.0
+  newTag: v2.0.1
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.0.0
+  newTag: v2.0.1
 resources:
 - ../../base/application-controller
 - ../../base/dex
--- a/manifests/ha/base/redis-ha/chart/upstream.yaml
+++ b/manifests/ha/base/redis-ha/chart/upstream.yaml
@@ -39,6 +39,7 @@ data:
  redis.conf: |
    dir "/data"
    port 6379
+    bind 0.0.0.0
    maxmemory 0
    maxmemory-policy volatile-lru
    min-replicas-max-lag 5
@@ -55,6 +56,7 @@ data:
        sentinel failover-timeout argocd 180000
        maxclients 10000
        sentinel parallel-syncs argocd 5
+    bind 0.0.0.0

  init.sh: |
    echo "$(date) Start..."
@@ -852,7 +854,7 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
      labels:
        release: argocd
        app: redis-ha
--- a/manifests/ha/base/redis-ha/chart/values.yaml
+++ b/manifests/ha/base/redis-ha/chart/values.yaml
@@ -5,9 +5,13 @@ redis-ha:
    masterGroupName: argocd
    config:
      save: "\"\""
+      bind: "0.0.0.0"
  haproxy:
    enabled: true
    image:
      tag: 2.0.20-alpine
  image:
    tag: 6.2.1-alpine
+  sentinel:
+    config:
+      replaceme: "0.0.0.0"
--- a/manifests/ha/base/redis-ha/generate.sh
+++ b/manifests/ha/base/redis-ha/generate.sh
@@ -14,3 +14,4 @@ helm template argocd ./chart \
 sed -e 's/check inter 1s/check inter 3s/' ./chart/upstream_orig.yaml >> ./chart/upstream.yaml && rm ./chart/upstream_orig.yaml
 sed -i.bak 's/timeout server 30s/timeout server 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
 sed -i.bak 's/timeout client 30s/timeout client 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
+sed -i.bak -E 's/^([[:space:]]){8}sentinel replaceme argocd/    bind/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -2850,6 +2850,7 @@ data:
  redis.conf: |
    dir "/data"
    port 6379
+    bind 0.0.0.0
    maxmemory 0
    maxmemory-policy volatile-lru
    min-replicas-max-lag 5
@@ -2865,6 +2866,7 @@ data:
        sentinel failover-timeout argocd 180000
        maxclients 10000
        sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
  labels:
@@ -3176,7 +3178,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3310,7 +3312,7 @@ spec:
        - argocd-repo-server
        - --redis
        - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3411,7 +3413,7 @@ spec:
        env:
        - name: ARGOCD_API_SERVER_REPLICAS
          value: "2"
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3506,7 +3508,7 @@ spec:
        - "10"
        - --redis
        - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3564,7 +3566,7 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
      labels:
        app.kubernetes.io/name: argocd-redis-ha
    spec:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -2765,6 +2765,7 @@ data:
  redis.conf: |
    dir "/data"
    port 6379
+    bind 0.0.0.0
    maxmemory 0
    maxmemory-policy volatile-lru
    min-replicas-max-lag 5
@@ -2780,6 +2781,7 @@ data:
        sentinel failover-timeout argocd 180000
        maxclients 10000
        sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
  labels:
@@ -3091,7 +3093,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3225,7 +3227,7 @@ spec:
        - argocd-repo-server
        - --redis
        - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3326,7 +3328,7 @@ spec:
        env:
        - name: ARGOCD_API_SERVER_REPLICAS
          value: "2"
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3421,7 +3423,7 @@ spec:
        - "10"
        - --redis
        - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3479,7 +3481,7 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
      labels:
        app.kubernetes.io/name: argocd-redis-ha
    spec:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -2544,7 +2544,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -2644,7 +2644,7 @@ spec:
        - argocd-repo-server
        - --redis
        - argocd-redis:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -2740,7 +2740,7 @@ spec:
        - argocd-server
        - --staticassets
        - /shared/app
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -2833,7 +2833,7 @@ spec:
        - "20"
        - --operation-processors
        - "10"
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -2459,7 +2459,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -2559,7 +2559,7 @@ spec:
        - argocd-repo-server
        - --redis
        - argocd-redis:6379
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -2655,7 +2655,7 @@ spec:
        - argocd-server
        - --staticassets
        - /shared/app
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -2748,7 +2748,7 @@ spec:
        - "20"
        - --operation-processors
        - "10"
-        image: quay.io/argoproj/argocd:v2.0.0
+        image: quay.io/argoproj/argocd:v2.0.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/resource_customizations/sparkoperator.k8s.io/SparkApplication/health.lua
+++ b/resource_customizations/sparkoperator.k8s.io/SparkApplication/health.lua
@@ -6,18 +6,20 @@ if obj.status ~= nil then
      health_status.message = "SparkApplication was added, enqueuing it for submission"
      return health_k9sstatus
    end
-    count=0
-    executor_instances = obj.spec.executor.instances
-    for i, executorState in pairs(obj.status.executorState) do
-      if executorState == "RUNNING" then
-          count=count+1
+    if obj.status.applicationState.state == "RUNNING" then
+      if obj.status.executorState ~= nil then
+        count=0
+        executor_instances = obj.spec.executor.instances
+        for i, executorState in pairs(obj.status.executorState) do
+          if executorState == "RUNNING" then
+            count=count+1
+          end
+        end
+        if executor_instances == count then
+          health_status.status = "Healthy"
+          health_status.message = "SparkApplication is Running"
+          return health_status
        end
-    end
-    if executor_instances == count then
-      if obj.status.applicationState.state == "RUNNING" then
-        health_status.status = "Healthy"
-        health_status.message = "SparkApplication is in RunningState"
-        return health_status
      end
    end
    if obj.status.applicationState.state == "SUBMITTED" then
--- a/resource_customizations/sparkoperator.k8s.io/SparkApplication/health_test.yaml
+++ b/resource_customizations/sparkoperator.k8s.io/SparkApplication/health_test.yaml
@@ -9,5 +9,5 @@ tests:
  inputPath: testdata/degraded.yaml
 - healthStatus:
    status: Healthy
-    message: "SparkApplication is in RunningState"
+    message: "SparkApplication is Running"
  inputPath: testdata/healthy.yaml
--- a/ui/src/app/settings/components/repos-list/repos-list.tsx
+++ b/ui/src/app/settings/components/repos-list/repos-list.tsx
@@ -410,7 +410,7 @@ export class ReposList extends React.Component<RouteComponentProps<any>, {connec
                                <div className='argo-form-row'>
                                    <FormField formApi={formApi} label='Type' field='ghType' component={FormSelect} componentProps={{options: ['GitHub', 'GitHub Enterprise']}} />
                                </div>
-                                {formApi.getFormState().values.type === 'GitHub Enterprise' && (
+                                {formApi.getFormState().values.ghType === 'GitHub Enterprise' && (
                                    <React.Fragment>
                                        <div className='argo-form-row'>
                                            <FormField
Author	SHA1	Message	Date
argo-bot	33eaf11e3a	Bump version to 2.0.1	2021-04-15 22:24:00 +00:00
argo-bot	231ba90a19	Bump version to 2.0.1	2021-04-15 22:23:46 +00:00
Petr Drastil	7d39152c8c	fix: spark application check fails on missing section (#6036 ) * fix: spark application check fails on missing section Signed-off-by: Petr Drastil <petr.drastil@gmail.com>	2021-04-15 15:18:02 -07:00
rumstead	2bbb0b1a1a	Adding explicit bind to redis and sentinel for IPv4 clusters #5957 (#6005 ) * fix(redis-ha): Adding explicit bind to redis and sentinel config to support IPv4 clusters. Closes #5957 Signed-off-by: Ryan Umstead <ryan.umstead@blackrock.com>	2021-04-12 14:09:12 -07:00
Jonah Back	85728a6dbf	fix: use correct field for evaluating whether or not GitHub Enterprise is selected (#5987 ) Signed-off-by: Jonah Back <jonah@jonahback.com>	2021-04-12 14:03:55 -07:00
@@ -1 +1 @@
 .0.0
 .0.1