From 13531e6160995954f0323e02dec10e0abd486b77 Mon Sep 17 00:00:00 2001 From: qasmi Date: Sun, 7 Dec 2025 19:40:12 +0900 Subject: [PATCH 1/5] deloy oss demo app --- demo-cluster/.k8s-gen/app-manifests.yaml | 37 +++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/demo-cluster/.k8s-gen/app-manifests.yaml b/demo-cluster/.k8s-gen/app-manifests.yaml index 9c89d17..9b8774d 100644 --- a/demo-cluster/.k8s-gen/app-manifests.yaml +++ b/demo-cluster/.k8s-gen/app-manifests.yaml @@ -1,4 +1,39 @@ - +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-oss-japan +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: game-2048 + namespace: argocd +spec: + destination: + namespace: demo-oss-japan + server: https://kubernetes.default.svc + project: user + revisionHistoryLimit: 3 + sources: + - chart: dao-2048 + helm: + values: | + nodeSelector: + role: storage + tolerations: + - key: role + value: storage + operator: Equal + effect: NoSchedule + service: + type: LoadBalancer + repoURL: http://daocloud.github.io/dao-2048/ + targetRevision: "1.2.1" + syncPolicy: + automated: + prune: true + selfHeal: true --- apiVersion: argoproj.io/v1alpha1 kind: AppProject From 5369037aa5edf9240e48fd6a80800b2e8e74a7e3 Mon Sep 17 00:00:00 2001 From: qasmi Date: Sun, 7 Dec 2025 20:12:12 +0900 Subject: [PATCH 2/5] deloy oss demo app --- demo-cluster/.k8s-gen/app-manifests.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/demo-cluster/.k8s-gen/app-manifests.yaml b/demo-cluster/.k8s-gen/app-manifests.yaml index 9b8774d..7ac5754 100644 --- a/demo-cluster/.k8s-gen/app-manifests.yaml +++ b/demo-cluster/.k8s-gen/app-manifests.yaml @@ -19,13 +19,15 @@ spec: - chart: dao-2048 helm: values: | - nodeSelector: - role: storage - tolerations: - - key: role - value: storage - operator: Equal - effect: NoSchedule + resources: + limits: + cpu: 500m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + securityContext: + runAsNonRoot: true service: type: LoadBalancer repoURL: http://daocloud.github.io/dao-2048/ From 2efd8f32b05b49e0733b4410623f789846e64cd7 Mon Sep 17 00:00:00 2001 From: qasmi Date: Mon, 8 Dec 2025 12:16:25 +0900 Subject: [PATCH 3/5] deloy oss demo app --- .../scenario-1/1-game-app-fixed.yaml | 69 +++++-------------- 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/demo-resources/scenario-1/1-game-app-fixed.yaml b/demo-resources/scenario-1/1-game-app-fixed.yaml index 7301ec6..12dda8a 100644 --- a/demo-resources/scenario-1/1-game-app-fixed.yaml +++ b/demo-resources/scenario-1/1-game-app-fixed.yaml @@ -1,33 +1,8 @@ --- -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: user - namespace: argocd -spec: - description: User project - destinations: - - server: https://kubernetes.default.svc - namespace: game-2048 - sourceRepos: - - http://daocloud.github.io/dao-2048/ ---- apiVersion: v1 kind: Namespace metadata: - name: game-2048 ---- -apiVersion: v1 -kind: ResourceQuota -metadata: - name: compute-quota - namespace: game-2048 -spec: - hard: - requests.cpu: "1" - requests.memory: "1Gi" - limits.cpu: "1" - limits.memory: "1Gi" + name: demo-oss-japan --- apiVersion: argoproj.io/v1alpha1 kind: Application @@ -36,34 +11,28 @@ metadata: namespace: argocd spec: destination: - namespace: game-2048 + namespace: demo-oss-japan server: https://kubernetes.default.svc project: user revisionHistoryLimit: 3 sources: - - chart: dao-2048 - helm: - values: | - replicaCount: 1 - - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi - - nodeSelector: - kubernetes.io/hostname: kind-worker - - service: - type: LoadBalancer - - repoURL: http://daocloud.github.io/dao-2048/ - targetRevision: "1.2.1" + - chart: dao-2048 + helm: + values: | + resources: + limits: + cpu: 500m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + securityContext: + runAsNonRoot: true + service: + type: LoadBalancer + repoURL: http://daocloud.github.io/dao-2048/ + targetRevision: "1.2.1" syncPolicy: automated: prune: true - selfHeal: true - + selfHeal: true \ No newline at end of file From 31a44aa9b525ab09147921704b6b37f5022c6389 Mon Sep 17 00:00:00 2001 From: qasmi Date: Mon, 8 Dec 2025 12:19:18 +0900 Subject: [PATCH 4/5] deloy oss demo app --- demo-resources/scenario-1/1-game-app-fixed.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-resources/scenario-1/1-game-app-fixed.yaml b/demo-resources/scenario-1/1-game-app-fixed.yaml index 12dda8a..f3b7c4c 100644 --- a/demo-resources/scenario-1/1-game-app-fixed.yaml +++ b/demo-resources/scenario-1/1-game-app-fixed.yaml @@ -35,4 +35,4 @@ spec: syncPolicy: automated: prune: true - selfHeal: true \ No newline at end of file + selfHeal: true From c02b1dc251901cb03b5105c6c0145486ee936376 Mon Sep 17 00:00:00 2001 From: qasmi Date: Mon, 8 Dec 2025 12:23:30 +0900 Subject: [PATCH 5/5] deloy oss demo app --- demo-cluster/.k8s-gen/app-manifests.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/demo-cluster/.k8s-gen/app-manifests.yaml b/demo-cluster/.k8s-gen/app-manifests.yaml index 7ac5754..f0000c7 100644 --- a/demo-cluster/.k8s-gen/app-manifests.yaml +++ b/demo-cluster/.k8s-gen/app-manifests.yaml @@ -19,13 +19,12 @@ spec: - chart: dao-2048 helm: values: | - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi securityContext: runAsNonRoot: true service: