add customizations for argoproj.io/v1alpha1/Workflow

Signed-off-by: yike21 <yike21@qq.com>
karmada-io · May 10, 2023 · 43ade98 · 43ade98
1 parent 7b1ddc9
commit 43ade98
Show file tree

Hide file tree

Showing 9 changed files with 830 additions and 1 deletion.
diff --git a/...e.io/v1alpha1/CronJob/customizations.yaml → ...lpha1/AdvancedCronJob/customizations.yaml b/...e.io/v1alpha1/CronJob/customizations.yaml → ...lpha1/AdvancedCronJob/customizations.yaml
diff --git a/...1/CronJob/testdata/desired-acj-nginx.yaml → ...edCronJob/testdata/desired-acj-nginx.yaml b/...1/CronJob/testdata/desired-acj-nginx.yaml → ...edCronJob/testdata/desired-acj-nginx.yaml
diff --git a/.../CronJob/testdata/observed-acj-nginx.yaml → ...dCronJob/testdata/observed-acj-nginx.yaml b/.../CronJob/testdata/observed-acj-nginx.yaml → ...dCronJob/testdata/observed-acj-nginx.yaml
diff --git a/...1alpha1/CronJob/testdata/status-file.yaml → ...AdvancedCronJob/testdata/status-file.yaml b/...1alpha1/CronJob/testdata/status-file.yaml → ...AdvancedCronJob/testdata/status-file.yaml
diff --git a/...hirdparty/resourcecustomizations/apps.kruise.io/v1alpha1/BroadcastJob/customizations.yaml b/...hirdparty/resourcecustomizations/apps.kruise.io/v1alpha1/BroadcastJob/customizations.yaml
@@ -132,8 +132,8 @@ spec:
         function Retain(desiredObj, observedObj)
           if observedObj.spec.template.metadata ~= nil and observedObj.spec.template.metadata.labels ~= nil then
             desiredObj.spec.template.metadata.labels = observedObj.spec.template.metadata.labels
-            return desiredObj
           end
+          return desiredObj
         end
     statusReflection:
       luaScript: >

diff --git a/...fault/thirdparty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/customizations.yaml b/...fault/thirdparty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/customizations.yaml
diff --git a/...party/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/desired-workflow.yaml b/...party/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/desired-workflow.yaml
@@ -0,0 +1,42 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  labels:
+    app: sample
+  name: sample
+  namespace: test-workflow
+spec:
+  parallelism: 2
+  entrypoint: volumes-existing-example
+  volumes:
+  - name: workdir
+    persistentVolumeClaim:
+      claimName: my-existing-volume
+  serviceAccountName: my-service-account
+  imagePullSecrets: 
+  - name: my-secret
+  tolerations:
+  - key: 'key'
+    operation: 'Equal'
+    value: 'value'
+    effect: 'NoSchedule'
+
+  templates:
+  - name: volumes-existing-example
+    steps:
+    - - name: hello
+        template: whalesay
+
+  - name: whalesay
+    container:
+      image: docker/whalesay:latest
+      command: [cowsay]
+      args: ["hello world"]
+      volumeMounts:
+      - name: workdir
+        mountPath: /mnt/vol
+      resources:
+        limits:
+          memory: 1Gi
+        requests:
+          memory: 1Mi
diff --git a/...arty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/observed-workflow.yaml b/...arty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/observed-workflow.yaml
@@ -0,0 +1,114 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  labels:
+    app: sample
+  name: sample
+  namespace: test-workflow
+spec:
+  parallelism: 1
+  entrypoint: volumes-existing-example
+  suspend: true
+  volumes:
+  - name: workdir
+    persistentVolumeClaim:
+      claimName: my-existing-volume
+  serviceAccountName: my-service-account
+  imagePullSecrets: 
+  - name: my-secret
+  tolerations:
+  - key: 'key'
+    operation: 'Equal'
+    value: 'value'
+    effect: 'NoSchedule'
+
+  templates:
+  - name: volumes-existing-example
+    steps:
+    - - name: hello
+        template: whalesay
+
+  - name: whalesay
+    container:
+      image: docker/whalesay:latest
+      command: [cowsay]
+      args: ["hello world"]
+      volumeMounts:
+      - name: workdir
+        mountPath: /mnt/vol
+      resources:
+        limits:
+          memory: 1Gi
+        requests:
+          memory: 1Mi
+status:
+  artifactGCStatus:
+    notSpecified: true
+  artifactRepositoryRef:
+    artifactRepository: {}
+    default: true
+  conditions:
+  - status: "False"
+    type: PodRunning
+  - status: "True"
+    type: Completed
+  finishedAt: "2023-04-20T11:26:47Z"
+  nodes:
+    sample:
+      children:
+      - sample-2754495299
+      displayName: sample
+      finishedAt: "2023-04-20T11:26:47Z"
+      id: sample
+      name: sample
+      outboundNodes:
+      - sample-410485805
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateName: volumes-existing-example
+      templateScope: local/sample
+      type: Steps
+    sample-410485805:
+      boundaryID: sample
+      displayName: hello
+      finishedAt: "2023-04-20T11:26:38Z"
+      hostNodeName: member1-control-plane
+      id: sample-410485805
+      name: sample[0].hello
+      outputs:
+        exitCode: "0"
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateName: whalesay
+      templateScope: local/sample
+      type: Pod
+    sample-2754495299:
+      boundaryID: sample
+      children:
+      - sample-410485805
+      displayName: '[0]'
+      finishedAt: "2023-04-20T11:26:47Z"
+      id: sample-2754495299
+      name: sample[0]
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateScope: local/sample
+      type: StepGroup
+  phase: Succeeded
+  progress: 1/1
+  resourcesDuration:
+    cpu: 19
+    memory: 18
+  startedAt: "2023-04-20T11:26:17Z"
diff --git a/...thirdparty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/status-file.yaml b/...thirdparty/resourcecustomizations/argoproj.io/v1alpha1/Workflow/testdata/status-file.yaml
@@ -0,0 +1,224 @@
+applied: true
+clusterName: member1
+health: Healthy
+status:
+  artifactGCStatus:
+    notSpecified: true
+  artifactRepositoryRef:
+    artifactRepository: {}
+    default: true
+  conditions:
+  - status: "False"
+    type: PodRunning
+  - status: "True"
+    type: Completed
+  finishedAt: "2023-04-20T11:26:47Z"
+  nodes:
+    sample:
+      children:
+      - sample-2754495299
+      displayName: sample
+      finishedAt: "2023-04-20T11:26:47Z"
+      id: sample
+      name: sample
+      outboundNodes:
+      - sample-410485805
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateName: volumes-existing-example
+      templateScope: local/sample
+      type: Steps
+    sample-410485805:
+      boundaryID: sample
+      displayName: hello
+      finishedAt: "2023-04-20T11:26:38Z"
+      hostNodeName: member1-control-plane
+      id: sample-410485805
+      name: sample[0].hello
+      outputs:
+        exitCode: "0"
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateName: whalesay
+      templateScope: local/sample
+      type: Pod
+    sample-2754495299:
+      boundaryID: sample
+      children:
+      - sample-410485805
+      displayName: '[0]'
+      finishedAt: "2023-04-20T11:26:47Z"
+      id: sample-2754495299
+      name: sample[0]
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 19
+        memory: 18
+      startedAt: "2023-04-20T11:26:17Z"
+      templateScope: local/sample
+      type: StepGroup
+  phase: Succeeded
+  progress: 1/1
+  resourcesDuration:
+    cpu: 19
+    memory: 18
+  startedAt: "2023-04-20T11:26:17Z"
+---
+applied: true
+clusterName: member2
+health: Unhealthy
+status:
+  artifactGCStatus:
+    notSpecified: true
+  artifactRepositoryRef:
+    artifactRepository: {}
+    default: true
+  conditions:
+  - status: "False"
+    type: PodRunning
+  - status: "True"
+    type: SpecError
+  finishedAt: "2023-04-20T11:32:45Z"
+  nodes:
+    sample:
+      children:
+      - sample-2754495299
+      displayName: sample
+      finishedAt: "2023-04-20T11:32:45Z"
+      id: sample
+      name: sample
+      outboundNodes:
+      - sample-410485805
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 24
+        memory: 23
+      startedAt: "2023-04-20T11:32:11Z"
+      templateName: volumes-existing-example
+      templateScope: local/sample
+      type: Steps
+    sample-410485805:
+      boundaryID: sample
+      displayName: hello
+      finishedAt: "2023-04-20T11:32:37Z"
+      hostNodeName: member3-control-plane
+      id: sample-410485805
+      name: sample[0].hello
+      outputs:
+        exitCode: "0"
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 24
+        memory: 23
+      startedAt: "2023-04-20T11:32:11Z"
+      templateName: whalesay
+      templateScope: local/sample
+      type: Pod
+    sample-2754495299:
+      boundaryID: sample
+      children:
+      - sample-410485805
+      displayName: '[0]'
+      finishedAt: "2023-04-20T11:32:45Z"
+      id: sample-2754495299
+      name: sample[0]
+      phase: Succeeded
+      progress: /1
+      resourcesDuration:
+        cpu: 17
+        memory: 19
+      startedAt: "2023-04-20T11:32:11Z"
+      templateScope: local/sample
+      type: StepGroup
+  phase: Failed
+  progress: 0/1
+  resourcesDuration:
+    cpu: 17
+    memory: 19
+  startedAt: "2023-04-20T11:32:11Z"
+---
+applied: true
+clusterName: member3
+health: Healthy
+status:
+  artifactGCStatus:
+    notSpecified: true
+  artifactRepositoryRef:
+    artifactRepository: {}
+    default: true
+  conditions:
+  - status: "False"
+    type: PodRunning
+  - status: "True"
+    type: Completed
+  finishedAt: "2023-04-20T11:32:45Z"
+  nodes:
+    sample:
+      children:
+      - sample-2754495299
+      displayName: sample
+      finishedAt: "2023-04-20T11:32:45Z"
+      id: sample
+      name: sample
+      outboundNodes:
+      - sample-410485805
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 24
+        memory: 23
+      startedAt: "2023-04-20T11:32:11Z"
+      templateName: volumes-existing-example
+      templateScope: local/sample
+      type: Steps
+    sample-410485805:
+      boundaryID: sample
+      displayName: hello
+      finishedAt: "2023-04-20T11:32:37Z"
+      hostNodeName: member3-control-plane
+      id: sample-410485805
+      name: sample[0].hello
+      outputs:
+        exitCode: "0"
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 24
+        memory: 23
+      startedAt: "2023-04-20T11:32:11Z"
+      templateName: whalesay
+      templateScope: local/sample
+      type: Pod
+    sample-2754495299:
+      boundaryID: sample
+      children:
+      - sample-410485805
+      displayName: '[0]'
+      finishedAt: "2023-04-20T11:32:45Z"
+      id: sample-2754495299
+      name: sample[0]
+      phase: Succeeded
+      progress: 1/1
+      resourcesDuration:
+        cpu: 24
+        memory: 23
+      startedAt: "2023-04-20T11:32:11Z"
+      templateScope: local/sample
+      type: StepGroup
+  phase: Succeeded
+  progress: 1/1
+  resourcesDuration:
+    cpu: 24
+    memory: 23
+  startedAt: "2023-04-20T11:32:11Z"