From 8b9b75a7cb2d172cde062da99962c38fe2f35c35 Mon Sep 17 00:00:00 2001 From: soufianem370 Date: Tue, 2 Jun 2020 13:38:23 +0000 Subject: [PATCH 01/64] soufianem370 --- releases/dev/podinfo.yaml | 4 ++-- releases/prod/podinfo.yaml | 4 ++-- releases/stg/podinfo.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 1132031ddc..570e1df416 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -10,12 +10,12 @@ metadata: spec: releaseName: podinfo-dev chart: - git: git@github.com:fluxcd/helm-operator-get-started + git: git@github.com:soufianem370/helm-operator-get-started path: charts/podinfo ref: master values: image: - repository: stefanprodan/podinfo + repository: soufianem370/podinfo tag: dev-hdtwcel9 replicaCount: 1 hpa: diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 56d46cc26b..c94a50b78b 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -10,11 +10,11 @@ metadata: spec: releaseName: podinfo-prod chart: - git: git@github.com:fluxcd/helm-operator-get-started + git: git@github.com:soufianem370/helm-operator-get-started path: charts/podinfo ref: master values: image: - repository: stefanprodan/podinfo + repository: soufianem370/podinfo tag: 0.4.11 replicaCount: 3 diff --git a/releases/stg/podinfo.yaml b/releases/stg/podinfo.yaml index 3ee39da1e6..24d930032b 100644 --- a/releases/stg/podinfo.yaml +++ b/releases/stg/podinfo.yaml @@ -10,12 +10,12 @@ metadata: spec: releaseName: podinfo-rc chart: - git: git@github.com:fluxcd/helm-operator-get-started + git: git@github.com:soufianem370/helm-operator-get-started path: charts/podinfo ref: master values: image: - repository: stefanprodan/podinfo + repository: soufianem370/podinfo tag: stg-9ij63o4c replicaCount: 2 hpa: From 49114a29179a2d5b0602244d6ec9a409de1469c4 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 15:18:34 +0100 Subject: [PATCH 02/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 570e1df416..7387f0f429 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-hdtwcel9 + tag: dev-eobmcqmy replicaCount: 1 hpa: enabled: false From e04ed5186b63194b210028230891675ef1bd2757 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 15:39:31 +0100 Subject: [PATCH 03/64] Update podinfo.yaml From 0405d58f90b822246a5f604a03fcf32b68d5be36 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 15:40:20 +0100 Subject: [PATCH 04/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 7387f0f429..b57eab5634 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,6 +17,6 @@ spec: image: repository: soufianem370/podinfo tag: dev-eobmcqmy - replicaCount: 1 + replicaCount: 2 hpa: enabled: false From e0c00b27db72fd7c1e7fcb68f38ebfd2e3858c93 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 15:53:53 +0100 Subject: [PATCH 05/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index b57eab5634..bf8f5ccc56 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-eobmcqmy + tag: dev-hdtwcel9 replicaCount: 2 hpa: enabled: false From ea66a928c4066f86a02b65c644760ccd33100693 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 16:04:36 +0100 Subject: [PATCH 06/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index bf8f5ccc56..22e9d07c21 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,8 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-hdtwcel9 + tag: dev-eobmcqmy replicaCount: 2 hpa: enabled: false + From 6d17cbabbf737d2c2d6aef4f63a26d7f521d96a6 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 16:12:25 +0100 Subject: [PATCH 07/64] Update podinfo.yaml --- releases/stg/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/stg/podinfo.yaml b/releases/stg/podinfo.yaml index 24d930032b..9e14ad58c2 100644 --- a/releases/stg/podinfo.yaml +++ b/releases/stg/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: stg-9ij63o4c + tag: dev-eobmcqmy replicaCount: 2 hpa: enabled: true From 9baf54c5cd80293f70edb5c232ab2ca5e4bb52e6 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 23:35:23 +0100 Subject: [PATCH 08/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 22e9d07c21..dfbdea5da1 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,8 +16,8 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-eobmcqmy - replicaCount: 2 + tag: dev-hdtwcel9 + replicaCount: 1 hpa: enabled: false From aa6b3a8266e8ef42e6001633dc1efef241313461 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 2 Jun 2020 23:39:56 +0100 Subject: [PATCH 09/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index dfbdea5da1..ba36520fa6 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-hdtwcel9 + tag: dev-eobmcqmy replicaCount: 1 hpa: enabled: false From f4ee444b3f8f842f6485c4ed737f43dcae498528 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 3 Jun 2020 00:09:22 +0100 Subject: [PATCH 10/64] Create nginx_deploy.yml --- nginx_deploy.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 nginx_deploy.yml diff --git a/nginx_deploy.yml b/nginx_deploy.yml new file mode 100644 index 0000000000..705bd42430 --- /dev/null +++ b/nginx_deploy.yml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + app: nginx +spec: + replicas: 3 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx:1.7.9 + ports: + - containerPort: 80 + From a1b53c390cbb8728cad25e2336d3debb48391d0a Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 3 Jun 2020 00:12:27 +0100 Subject: [PATCH 11/64] Update nginx_deploy.yml --- nginx_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx_deploy.yml b/nginx_deploy.yml index 705bd42430..e031e3fccf 100644 --- a/nginx_deploy.yml +++ b/nginx_deploy.yml @@ -5,7 +5,7 @@ metadata: labels: app: nginx spec: - replicas: 3 + replicas: 1 selector: matchLabels: app: nginx From 76840fcc67c3699ab242cddd7991b6a6c38908b7 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Fri, 19 Jun 2020 01:38:20 +0100 Subject: [PATCH 12/64] Update nginx_deploy.yml --- nginx_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx_deploy.yml b/nginx_deploy.yml index e031e3fccf..39fa33149f 100644 --- a/nginx_deploy.yml +++ b/nginx_deploy.yml @@ -5,7 +5,7 @@ metadata: labels: app: nginx spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: nginx From 8ef98531deb37d4e0260dd3c31f9faf55049df36 Mon Sep 17 00:00:00 2001 From: soufianem370 Date: Fri, 5 Jun 2020 17:00:39 +0000 Subject: [PATCH 13/64] add tag --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index ba36520fa6..16fc2913f3 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-eobmcqmy + tag: dev-dev-g7ehaf6e replicaCount: 1 hpa: enabled: false From 84e094b21c5508f91080b1e20a777e3407a403fa Mon Sep 17 00:00:00 2001 From: soufianem370 Date: Fri, 5 Jun 2020 20:24:35 +0000 Subject: [PATCH 14/64] test nexus --- releases/dev/nexus.yaml | 104 ++++++++++++++++++++++++++++++++++++++ releases/dev/podinfo.yaml | 2 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 releases/dev/nexus.yaml diff --git a/releases/dev/nexus.yaml b/releases/dev/nexus.yaml new file mode 100644 index 0000000000..fc780f5c2b --- /dev/null +++ b/releases/dev/nexus.yaml @@ -0,0 +1,104 @@ +--- +apiVersion: flux.weave.works/v1beta1 +kind: HelmRelease +metadata: + name: nexus + namespace: devops + annotations: + flux.weave.works/automated: "false" +spec: + releaseName: digimind-nexus + chart: + repository: https://kubernetes-charts.storage.googleapis.com/ + name: sonatype-nexus + version: 1.5.1 + values: + replicaCount: 1 + + nexus: + imageName: quay.io/travelaudience/docker-nexus + imageTag: 3.14.0 + imagePullPolicy: IfNotPresent + env: + - name: install4jAddVmParams + value: "-Xms1200M -Xmx1200M -XX:MaxDirectMemorySize=2G -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" + dockerPort: 5003 + nexusPort: 8081 + serviceType: NodePort + livenessProbe: + failureThreshold: 6 + initialDelaySeconds: 30 + path: / + periodSeconds: 30 + readinessProbe: + failureThreshold: 6 + initialDelaySeconds: 30 + path: / + periodSeconds: 30 + resources: + ## Based on https://support.sonatype.com/hc/en-us/articles/115006448847#mem + ## and https://twitter.com/analytically/status/894592422382063616: + ## Xms == Xmx + ## Xmx <= 4G + ## MaxDirectMemory >= 2G + ## Xmx + MaxDirectMemory <= RAM * 2/3 (hence the request for 4800Mi) + ## MaxRAMFraction=1 is not being set as it would allow the heap + ## to use all the available memory. + # cpu: 250m + # memory: 4800Mi + limits: + cpu: 1 + memory: 4800Mi + requests: + cpu: 500m + memory: 4800Mi + + nexusProxy: + imageName: quay.io/travelaudience/docker-nexus-proxy + imageTag: 2.1.0 + imagePullPolicy: IfNotPresent + env: + cloudIamAuthEnabled: false + enforceHttps: true + nexusDockerHost: dcr.digimind.tech + nexusHttpHost: nexus.digimind.tech + port: 8080 + resources: + limits: + cpu: 200m + memory: 1024Mi + requests: + cpu: 100m + memory: 256Mi + + persistence: + accessMode: ReadWriteOnce + enabled: true + storageClass: nfs-client + storageSize: 500Gi + + nexusBackup: + enabled: false + imageName: quay.io/travelaudience/docker-nexus-backup + imageTag: 1.2.0 + imagePullPolicy: IfNotPresent + env: + targetBucket: null + nexusAdminPassword: Wse45Tgb! + persistence: + enabled: true + existingClaim: nexus-backup + + ingress: + enabled: false + annotations: + certmanager.k8s.io/acme-challenge-type: dns01 + certmanager.k8s.io/acme-dns01-provider: digimind.tech + certmanager.k8s.io/cluster-issuer: letsencrypt-d-rdlabs + kubernetes.io/ingress.allow-http: true + kubernetes.io/ingress.class: nginx + kubernetes.io/tls-acme: "true" + path: / + tls: + enabled: false + secretName: nexus-tls diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 16fc2913f3..9c27fd66c4 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-dev-g7ehaf6e + tag: dev-g7ehaf6e replicaCount: 1 hpa: enabled: false From c42b79b79fbed5a73cbaaff79ddd0ab57bcf635f Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Fri, 19 Jun 2020 23:20:10 +0100 Subject: [PATCH 15/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 16fc2913f3..9c27fd66c4 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-dev-g7ehaf6e + tag: dev-g7ehaf6e replicaCount: 1 hpa: enabled: false From 86988776f08d51a10af53f4592b94e9e8919a80e Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Fri, 19 Jun 2020 23:27:37 +0100 Subject: [PATCH 16/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 9c27fd66c4..ba36520fa6 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-g7ehaf6e + tag: dev-eobmcqmy replicaCount: 1 hpa: enabled: false From 19018bd5463f904ca71d88d8883110bdc96d209c Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Sat, 6 Jun 2020 21:56:07 +0000 Subject: [PATCH 17/64] Auto-release soufianem370/podinfo:dev-g7ehaf6e --- releases/dev/podinfo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index ba36520fa6..be15e2bcdb 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,8 +16,8 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-eobmcqmy + tag: dev-g7ehaf6e replicaCount: 1 hpa: enabled: false - + From 4e28bc4590d59ac240f823fc62ee4cfea84f5b12 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sat, 20 Jun 2020 00:02:24 +0100 Subject: [PATCH 18/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index c94a50b78b..166dce875e 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -16,5 +16,5 @@ spec: values: image: repository: soufianem370/podinfo - tag: 0.4.11 + tag: prod-g7ehaf6e replicaCount: 3 From 5ef73d019b3df4b7f2347e5ba9e7cef908c0c4f9 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sat, 20 Jun 2020 00:18:40 +0100 Subject: [PATCH 19/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 166dce875e..572c80e12e 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -17,4 +17,4 @@ spec: image: repository: soufianem370/podinfo tag: prod-g7ehaf6e - replicaCount: 3 + replicaCount: 2 From 2a9944be3174f3ff7f3e298f9cc465938e045d93 Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Sat, 6 Jun 2020 22:30:03 +0000 Subject: [PATCH 20/64] Auto-release soufianem370/podinfo:dev-qsm7vwwf --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index be15e2bcdb..41c1a3bedd 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-g7ehaf6e + tag: dev-qsm7vwwf replicaCount: 1 hpa: enabled: false From ecde84c1d94c5f0edbe743487eb937c5ad62c475 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sat, 20 Jun 2020 00:47:44 +0100 Subject: [PATCH 21/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 41c1a3bedd..fb342672d2 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,7 +17,7 @@ spec: image: repository: soufianem370/podinfo tag: dev-qsm7vwwf - replicaCount: 1 + replicaCount: 2 hpa: enabled: false From 279fdd3cc1d9916e955d26771dbf599b30a81e1a Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sat, 20 Jun 2020 01:08:34 +0100 Subject: [PATCH 22/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index fb342672d2..41c1a3bedd 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,7 +17,7 @@ spec: image: repository: soufianem370/podinfo tag: dev-qsm7vwwf - replicaCount: 2 + replicaCount: 1 hpa: enabled: false From 9997ea8131c29c29a376b73e10fdc589e8fedf92 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sat, 20 Jun 2020 01:10:14 +0100 Subject: [PATCH 23/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 41c1a3bedd..fb342672d2 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,7 +17,7 @@ spec: image: repository: soufianem370/podinfo tag: dev-qsm7vwwf - replicaCount: 1 + replicaCount: 2 hpa: enabled: false From 012ac0653ae30709cc824c52b1a22f4b67a417e8 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sun, 21 Jun 2020 03:30:10 +0100 Subject: [PATCH 24/64] Create podinfo.yaml --- releases/prod/podinfo.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 releases/prod/podinfo.yaml diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml new file mode 100644 index 0000000000..56d46cc26b --- /dev/null +++ b/releases/prod/podinfo.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: helm.fluxcd.io/v1 +kind: HelmRelease +metadata: + name: podinfo-prod + namespace: prod + annotations: + fluxcd.io/automated: "true" + filter.fluxcd.io/chart-image: semver:~0.4 +spec: + releaseName: podinfo-prod + chart: + git: git@github.com:fluxcd/helm-operator-get-started + path: charts/podinfo + ref: master + values: + image: + repository: stefanprodan/podinfo + tag: 0.4.11 + replicaCount: 3 From 2470fdd46cf012c250beda766e6a9e919c938316 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Sun, 21 Jun 2020 03:31:42 +0100 Subject: [PATCH 25/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 56d46cc26b..c94a50b78b 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -10,11 +10,11 @@ metadata: spec: releaseName: podinfo-prod chart: - git: git@github.com:fluxcd/helm-operator-get-started + git: git@github.com:soufianem370/helm-operator-get-started path: charts/podinfo ref: master values: image: - repository: stefanprodan/podinfo + repository: soufianem370/podinfo tag: 0.4.11 replicaCount: 3 From a749231522205af48e4a14e9cbb37d9183bce7bc Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Mon, 22 Jun 2020 22:02:08 +0100 Subject: [PATCH 26/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index c94a50b78b..55a835fdf2 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -17,4 +17,4 @@ spec: image: repository: soufianem370/podinfo tag: 0.4.11 - replicaCount: 3 + replicaCount: 2 From 120060c738770e04a414d384869677588d1b322e Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Mon, 22 Jun 2020 22:03:41 +0100 Subject: [PATCH 27/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 55a835fdf2..c94a50b78b 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -17,4 +17,4 @@ spec: image: repository: soufianem370/podinfo tag: 0.4.11 - replicaCount: 2 + replicaCount: 3 From 7afb0b678be507571e86d545178f76f38248a6fe Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Mon, 22 Jun 2020 22:53:23 +0100 Subject: [PATCH 28/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index c0b85986f3..41c1a3bedd 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,13 +16,8 @@ spec: values: image: repository: soufianem370/podinfo -<<<<<<< HEAD - tag: dev-g7ehaf6e - replicaCount: 1 -======= tag: dev-qsm7vwwf - replicaCount: 2 ->>>>>>> 9997ea8131c29c29a376b73e10fdc589e8fedf92 + replicaCount: 1 hpa: enabled: false From 03bae40c7abf93946b1311093c5aa54fa5bca622 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 01:50:49 +0100 Subject: [PATCH 29/64] Create manifest-test-flux.yml --- manifest-test-flux.yml | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 manifest-test-flux.yml diff --git a/manifest-test-flux.yml b/manifest-test-flux.yml new file mode 100644 index 0000000000..15db7d2edf --- /dev/null +++ b/manifest-test-flux.yml @@ -0,0 +1,43 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + app: hola-php + name: hola-php + namespace: test-flux +spec: + replicas: 1 + selector: + matchLabels: + app: hola-php + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: hola-php + spec: + containers: + - image: nginx:latest + name: gitlab-esp-kube-2trxq + imagePullPolicy: "Always" + resources: {} +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + app: hola-php + name: hola-php + namespace: test-flux +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + nodePort: 32333 + selector: + app: hola-php + type: NodePort From a6730e870e677cb792f5812bd6a59be3de2bc900 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 01:54:36 +0100 Subject: [PATCH 30/64] Create obs.yml --- namespaces/obs.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 namespaces/obs.yml diff --git a/namespaces/obs.yml b/namespaces/obs.yml new file mode 100644 index 0000000000..9563f2fb3a --- /dev/null +++ b/namespaces/obs.yml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: obs From 525af07c2ed8fbf7779cf4d902ab9937dc7ef9a5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Jun 2020 00:58:24 +0000 Subject: [PATCH 31/64] add files --- manifeste/manifest-test-flux.yml | 43 ++++++++++++++++++++++++++++++++ manifeste/nginx_deploy.yml | 22 ++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 manifeste/manifest-test-flux.yml create mode 100644 manifeste/nginx_deploy.yml diff --git a/manifeste/manifest-test-flux.yml b/manifeste/manifest-test-flux.yml new file mode 100644 index 0000000000..15db7d2edf --- /dev/null +++ b/manifeste/manifest-test-flux.yml @@ -0,0 +1,43 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + app: hola-php + name: hola-php + namespace: test-flux +spec: + replicas: 1 + selector: + matchLabels: + app: hola-php + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: hola-php + spec: + containers: + - image: nginx:latest + name: gitlab-esp-kube-2trxq + imagePullPolicy: "Always" + resources: {} +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + app: hola-php + name: hola-php + namespace: test-flux +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + nodePort: 32333 + selector: + app: hola-php + type: NodePort diff --git a/manifeste/nginx_deploy.yml b/manifeste/nginx_deploy.yml new file mode 100644 index 0000000000..39fa33149f --- /dev/null +++ b/manifeste/nginx_deploy.yml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + app: nginx +spec: + replicas: 2 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx:1.7.9 + ports: + - containerPort: 80 + From 644c88dff20a7394833e3c9a4f7e38e1594d3898 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:03:04 +0100 Subject: [PATCH 32/64] Delete nexus.yaml --- releases/dev/nexus.yaml | 104 ---------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 releases/dev/nexus.yaml diff --git a/releases/dev/nexus.yaml b/releases/dev/nexus.yaml deleted file mode 100644 index fc780f5c2b..0000000000 --- a/releases/dev/nexus.yaml +++ /dev/null @@ -1,104 +0,0 @@ ---- -apiVersion: flux.weave.works/v1beta1 -kind: HelmRelease -metadata: - name: nexus - namespace: devops - annotations: - flux.weave.works/automated: "false" -spec: - releaseName: digimind-nexus - chart: - repository: https://kubernetes-charts.storage.googleapis.com/ - name: sonatype-nexus - version: 1.5.1 - values: - replicaCount: 1 - - nexus: - imageName: quay.io/travelaudience/docker-nexus - imageTag: 3.14.0 - imagePullPolicy: IfNotPresent - env: - - name: install4jAddVmParams - value: "-Xms1200M -Xmx1200M -XX:MaxDirectMemorySize=2G -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" - dockerPort: 5003 - nexusPort: 8081 - serviceType: NodePort - livenessProbe: - failureThreshold: 6 - initialDelaySeconds: 30 - path: / - periodSeconds: 30 - readinessProbe: - failureThreshold: 6 - initialDelaySeconds: 30 - path: / - periodSeconds: 30 - resources: - ## Based on https://support.sonatype.com/hc/en-us/articles/115006448847#mem - ## and https://twitter.com/analytically/status/894592422382063616: - ## Xms == Xmx - ## Xmx <= 4G - ## MaxDirectMemory >= 2G - ## Xmx + MaxDirectMemory <= RAM * 2/3 (hence the request for 4800Mi) - ## MaxRAMFraction=1 is not being set as it would allow the heap - ## to use all the available memory. - # cpu: 250m - # memory: 4800Mi - limits: - cpu: 1 - memory: 4800Mi - requests: - cpu: 500m - memory: 4800Mi - - nexusProxy: - imageName: quay.io/travelaudience/docker-nexus-proxy - imageTag: 2.1.0 - imagePullPolicy: IfNotPresent - env: - cloudIamAuthEnabled: false - enforceHttps: true - nexusDockerHost: dcr.digimind.tech - nexusHttpHost: nexus.digimind.tech - port: 8080 - resources: - limits: - cpu: 200m - memory: 1024Mi - requests: - cpu: 100m - memory: 256Mi - - persistence: - accessMode: ReadWriteOnce - enabled: true - storageClass: nfs-client - storageSize: 500Gi - - nexusBackup: - enabled: false - imageName: quay.io/travelaudience/docker-nexus-backup - imageTag: 1.2.0 - imagePullPolicy: IfNotPresent - env: - targetBucket: null - nexusAdminPassword: Wse45Tgb! - persistence: - enabled: true - existingClaim: nexus-backup - - ingress: - enabled: false - annotations: - certmanager.k8s.io/acme-challenge-type: dns01 - certmanager.k8s.io/acme-dns01-provider: digimind.tech - certmanager.k8s.io/cluster-issuer: letsencrypt-d-rdlabs - kubernetes.io/ingress.allow-http: true - kubernetes.io/ingress.class: nginx - kubernetes.io/tls-acme: "true" - path: / - tls: - enabled: false - secretName: nexus-tls From 236125c1360999a33f7c5d0f3b74acc08d2d1ac4 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:03:44 +0100 Subject: [PATCH 33/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 41c1a3bedd..fb342672d2 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,7 +17,7 @@ spec: image: repository: soufianem370/podinfo tag: dev-qsm7vwwf - replicaCount: 1 + replicaCount: 2 hpa: enabled: false From 25d1259b7af06fee8de76902456ae6ef3b5188f3 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:10:32 +0100 Subject: [PATCH 34/64] Delete manifest-test-flux.yml --- manifest-test-flux.yml | 43 ------------------------------------------ 1 file changed, 43 deletions(-) delete mode 100644 manifest-test-flux.yml diff --git a/manifest-test-flux.yml b/manifest-test-flux.yml deleted file mode 100644 index 15db7d2edf..0000000000 --- a/manifest-test-flux.yml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - creationTimestamp: null - labels: - app: hola-php - name: hola-php - namespace: test-flux -spec: - replicas: 1 - selector: - matchLabels: - app: hola-php - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - app: hola-php - spec: - containers: - - image: nginx:latest - name: gitlab-esp-kube-2trxq - imagePullPolicy: "Always" - resources: {} ---- -apiVersion: v1 -kind: Service -metadata: - creationTimestamp: null - labels: - app: hola-php - name: hola-php - namespace: test-flux -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 80 - nodePort: 32333 - selector: - app: hola-php - type: NodePort From 88b2f86a3f6cb54b61f22daa4f7939eb8a85f719 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:10:54 +0100 Subject: [PATCH 35/64] Delete nginx_deploy.yml --- nginx_deploy.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 nginx_deploy.yml diff --git a/nginx_deploy.yml b/nginx_deploy.yml deleted file mode 100644 index 39fa33149f..0000000000 --- a/nginx_deploy.yml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx-deployment - labels: - app: nginx -spec: - replicas: 2 - selector: - matchLabels: - app: nginx - template: - metadata: - labels: - app: nginx - spec: - containers: - - name: nginx - image: nginx:1.7.9 - ports: - - containerPort: 80 - From 38354238730a0a29df673faced8019161829ead5 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:44:22 +0100 Subject: [PATCH 36/64] Create nginx-green.yml --- manifeste/nginx-green.yml | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 manifeste/nginx-green.yml diff --git a/manifeste/nginx-green.yml b/manifeste/nginx-green.yml new file mode 100644 index 0000000000..9d46296b4d --- /dev/null +++ b/manifeste/nginx-green.yml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: nginx-green + name: nginx-green + namespace: obs +spec: + replicas: 1 + selector: + matchLabels: + run: nginx-green + template: + metadata: + labels: + run: nginx-green + spec: + volumes: + - name: webdata + emptyDir: {} + initContainers: + - name: web-content + image: busybox + volumeMounts: + - name: webdata + mountPath: "/webdata" + command: ["/bin/sh", "-c", 'echo "

I am GREEN

" > /webdata/index.html'] + containers: + - image: nginx + name: nginx + volumeMounts: + - name: webdata + mountPath: "/usr/share/nginx/html" +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + run: nginx-green + name: nginx-green + namespace: obs +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + run: nginx-green + type: LoadBalancer +status: + loadBalancer: {} From fa184a5d5d0d07f2b7b12f8927d00083a178b0e9 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:48:21 +0100 Subject: [PATCH 37/64] Create nginx-red --- manifeste/nginx-red | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 manifeste/nginx-red diff --git a/manifeste/nginx-red b/manifeste/nginx-red new file mode 100644 index 0000000000..cc11f78aea --- /dev/null +++ b/manifeste/nginx-red @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + replicas: 1 + selector: + matchLabels: + run: nginx-red + template: + metadata: + labels: + run: nginx-red + spec: + volumes: + - name: webdata + emptyDir: {} + initContainers: + - name: web-content + image: busybox + volumeMounts: + - name: webdata + mountPath: "/webdata" + command: ["/bin/sh", "-c", 'echo "

I am red

" > /webdata/index.html'] + containers: + - image: nginx + name: nginx + volumeMounts: + - name: webdata + mountPath: "/usr/share/nginx/html" +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + run: nginx-red + type: LoadBalancer +status: + loadBalancer: {} From e4bc88c1b9a9024b6e6a9d87778ddff242a5351f Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:53:14 +0100 Subject: [PATCH 38/64] Delete nginx-red --- manifeste/nginx-red | 52 --------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 manifeste/nginx-red diff --git a/manifeste/nginx-red b/manifeste/nginx-red deleted file mode 100644 index cc11f78aea..0000000000 --- a/manifeste/nginx-red +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - run: nginx-red - name: nginx-red - namespace: obs -spec: - replicas: 1 - selector: - matchLabels: - run: nginx-red - template: - metadata: - labels: - run: nginx-red - spec: - volumes: - - name: webdata - emptyDir: {} - initContainers: - - name: web-content - image: busybox - volumeMounts: - - name: webdata - mountPath: "/webdata" - command: ["/bin/sh", "-c", 'echo "

I am red

" > /webdata/index.html'] - containers: - - image: nginx - name: nginx - volumeMounts: - - name: webdata - mountPath: "/usr/share/nginx/html" ---- -apiVersion: v1 -kind: Service -metadata: - creationTimestamp: null - labels: - run: nginx-red - name: nginx-red - namespace: obs -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 80 - selector: - run: nginx-red - type: LoadBalancer -status: - loadBalancer: {} From 9c0a4fc04a17b56f165b3eee0d445e541cb0b556 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 02:53:38 +0100 Subject: [PATCH 39/64] Update nginx-green.yml --- manifeste/nginx-green.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-green.yml b/manifeste/nginx-green.yml index 9d46296b4d..43e85339ba 100644 --- a/manifeste/nginx-green.yml +++ b/manifeste/nginx-green.yml @@ -6,7 +6,7 @@ metadata: name: nginx-green namespace: obs spec: - replicas: 1 + replicas: 2 selector: matchLabels: run: nginx-green From e5f372cfa90ae7684d06a1e3e586991391dcc432 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:00:43 +0100 Subject: [PATCH 40/64] Create nginx-red.yaml --- manifeste/nginx-red.yaml | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 manifeste/nginx-red.yaml diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml new file mode 100644 index 0000000000..c80d5473c0 --- /dev/null +++ b/manifeste/nginx-red.yaml @@ -0,0 +1,51 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + replicas: 1 + selector: + matchLabels: + run: nginx-red + template: + metadata: + labels: + run: nginx-red + spec: + volumes: + - name: webdata + emptyDir: {} + initContainers: + - name: web-content + image: busybox + volumeMounts: + - name: webdata + mountPath: "/webdata" + command: ["/bin/sh", "-c", 'echo "

I am Red

" > /webdata/index.html'] + containers: + - image: nginx + name: nginx + volumeMounts: + - name: webdata + mountPath: "/usr/share/nginx/html" +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + run: nginx-red + type: LoadBalancer + From 9336a544f65bd0c6ac2d37508b0ac4775194c170 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:05:29 +0100 Subject: [PATCH 41/64] Delete nginx-red.yaml --- manifeste/nginx-red.yaml | 51 ---------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 manifeste/nginx-red.yaml diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml deleted file mode 100644 index c80d5473c0..0000000000 --- a/manifeste/nginx-red.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - run: nginx-red - name: nginx-red - namespace: obs -spec: - replicas: 1 - selector: - matchLabels: - run: nginx-red - template: - metadata: - labels: - run: nginx-red - spec: - volumes: - - name: webdata - emptyDir: {} - initContainers: - - name: web-content - image: busybox - volumeMounts: - - name: webdata - mountPath: "/webdata" - command: ["/bin/sh", "-c", 'echo "

I am Red

" > /webdata/index.html'] - containers: - - image: nginx - name: nginx - volumeMounts: - - name: webdata - mountPath: "/usr/share/nginx/html" ---- -apiVersion: v1 -kind: Service -metadata: - creationTimestamp: null - labels: - run: nginx-red - name: nginx-red - namespace: obs -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 80 - selector: - run: nginx-red - type: LoadBalancer - From eff24ad808919559fdb14ad42bb138bb6dd46851 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:06:22 +0100 Subject: [PATCH 42/64] Create nginx-red.yaml --- manifeste/nginx-red.yaml | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 manifeste/nginx-red.yaml diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml new file mode 100644 index 0000000000..7b34139b10 --- /dev/null +++ b/manifeste/nginx-red.yaml @@ -0,0 +1,51 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + replicas: 1 + selector: + matchLabels: + run: nginx-red + template: + metadata: + labels: + run: nginx-red + spec: + volumes: + - name: webdata + emptyDir: {} + initContainers: + - name: web-content + image: busybox + volumeMounts: + - name: webdata + mountPath: "/webdata" + command: ["/bin/sh", "-c", 'echo "

I am Red

" > /webdata/index.html'] + containers: + - image: nginx + name: nginx + volumeMounts: + - name: webdata + mountPath: "/usr/share/nginx/html" +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + run: nginx-red + name: nginx-red + namespace: obs +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + run: nginx-red + type: LoadBalancer + From e1666d39fad3a56565918904d2b82eaece3a979a Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:08:29 +0100 Subject: [PATCH 43/64] =?UTF-8?q?workload=20ment=C3=A9=20en=20charge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 7b34139b10..867cdc0a9a 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 1 + replicas: 2 selector: matchLabels: run: nginx-red From 647b14bf5efa787776c0811bfdc0015415932223 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 08:32:50 +0100 Subject: [PATCH 44/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 867cdc0a9a..7b34139b10 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 2 + replicas: 1 selector: matchLabels: run: nginx-red From 7b82f98979b049e7ec4660b623d54404c1ea53c2 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 08:33:31 +0100 Subject: [PATCH 45/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 7b34139b10..867cdc0a9a 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 1 + replicas: 2 selector: matchLabels: run: nginx-red From a4dc43cdc95ec3ec94a5e2454b903c1f3af854e8 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 08:41:06 +0100 Subject: [PATCH 46/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 867cdc0a9a..7b34139b10 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 2 + replicas: 1 selector: matchLabels: run: nginx-red From 463af0755ab121f91d3bcedecd1390aef59f0925 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 08:49:37 +0100 Subject: [PATCH 47/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 7b34139b10..867cdc0a9a 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 1 + replicas: 2 selector: matchLabels: run: nginx-red From 9fd5e06c8d0e921b144241b88d0bd5c834d4558a Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 09:53:47 +0100 Subject: [PATCH 48/64] replicas 3 --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 867cdc0a9a..0cbd44c3e0 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 2 + replicas: 3 selector: matchLabels: run: nginx-red From 8c1018c2515dedf95a6af18da7f60409039acd0f Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Tue, 23 Jun 2020 09:58:07 +0100 Subject: [PATCH 49/64] Create nginx-blue.yaml --- manifeste/nginx-blue.yaml | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 manifeste/nginx-blue.yaml diff --git a/manifeste/nginx-blue.yaml b/manifeste/nginx-blue.yaml new file mode 100644 index 0000000000..7b8c505a25 --- /dev/null +++ b/manifeste/nginx-blue.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: nginx-blue + name: nginx-blue + namespace: obs +spec: + replicas: 3 + selector: + matchLabels: + run: nginx-blue + template: + metadata: + labels: + run: nginx-blue + spec: + volumes: + - name: webdata + emptyDir: {} + initContainers: + - name: web-content + image: busybox + volumeMounts: + - name: webdata + mountPath: "/webdata" + command: ["/bin/sh", "-c", 'echo "

I am blue

" > /webdata/index.html'] + containers: + - image: nginx + name: nginx + volumeMounts: + - name: webdata + mountPath: "/usr/share/nginx/html" +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + run: nginx-blue + name: nginx-blue + namespace: obs +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + run: nginx-blue + type: LoadBalancer From e2e86f569e3b88c1f6eaa00cb5f440affc4cec6a Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 24 Jun 2020 22:58:41 +0100 Subject: [PATCH 50/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index fb342672d2..41c1a3bedd 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -17,7 +17,7 @@ spec: image: repository: soufianem370/podinfo tag: dev-qsm7vwwf - replicaCount: 2 + replicaCount: 1 hpa: enabled: false From d49981dc6a9a43313ec28d5f5e7f92f8d146e859 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:08:31 +0100 Subject: [PATCH 51/64] Update values.yaml --- charts/podinfo/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml index 398c15093a..f417cb1c44 100644 --- a/charts/podinfo/values.yaml +++ b/charts/podinfo/values.yaml @@ -24,7 +24,7 @@ image: service: enabled: true - type: ClusterIP + type: LoadBalancer metricsPort: 9797 httpPort: 9898 externalPort: 9898 From f6d1a8cb22362f2ab78584dcd8249d5ee0e652a2 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:19:16 +0100 Subject: [PATCH 52/64] Update podinfo.yaml --- releases/dev/podinfo.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 41c1a3bedd..b88342e5ea 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -20,4 +20,7 @@ spec: replicaCount: 1 hpa: enabled: false + service: + type: LoadBalancer + port: 9898 From 2d071802f192ddbef8f94435189135cc906212c0 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:33:03 +0100 Subject: [PATCH 53/64] Update podinfo.yaml --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index c94a50b78b..3df4f72270 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -16,5 +16,5 @@ spec: values: image: repository: soufianem370/podinfo - tag: 0.4.11 + tag: dev-qsm7vwwf replicaCount: 3 From 714db9df2e47c345ea11cffcd42fa4cd35a0d15b Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:59:27 +0100 Subject: [PATCH 54/64] Create ci-mock.sh --- hack/ci-mock.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 hack/ci-mock.sh diff --git a/hack/ci-mock.sh b/hack/ci-mock.sh new file mode 100644 index 0000000000..97729564a5 --- /dev/null +++ b/hack/ci-mock.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +repository="stefanprodan/podinfo" +branch="master" +version="" +commit=$(cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1 | awk '{print tolower($0)}') + +while getopts :r:b:v: o; do + case "${o}" in + r) + repository=${OPTARG} + ;; + b) + branch=${OPTARG} + ;; + v) + version=${OPTARG} + ;; + esac +done +shift $((OPTIND-1)) + +if [ -z "${version}" ]; then + image="${repository}:${branch}-${commit}" + version="0.4.0" +else + image="${repository}:${version}" +fi + +echo ">>>> Building image ${image} <<<<" + +docker build --build-arg GITCOMMIT=${commit} --build-arg VERSION=${version} -t ${image} -f Dockerfile.ci . + +docker push ${image} From 7802f99fb78ce36881d87efa19b67865704d6d47 Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Tue, 23 Jun 2020 13:36:59 +0000 Subject: [PATCH 55/64] Auto-release soufianem370/podinfo:dev-y8x637ei --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index b88342e5ea..84bd43f56d 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-qsm7vwwf + tag: dev-y8x637ei replicaCount: 1 hpa: enabled: false From 9152025d0eae8b2b623c1abe9737e6c38d6a8028 Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Tue, 23 Jun 2020 14:11:47 +0000 Subject: [PATCH 56/64] Auto-release soufianem370/podinfo:dev-twadhvfl --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 84bd43f56d..a49a5aa029 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-y8x637ei + tag: dev-twadhvfl replicaCount: 1 hpa: enabled: false From 7ac4601b65be4d664017f83bf8f517ed272cac3e Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Tue, 23 Jun 2020 14:30:48 +0000 Subject: [PATCH 57/64] Auto-release soufianem370/podinfo:dev-5hfdy7mc --- releases/dev/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index a49a5aa029..fd9581f4b9 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -16,7 +16,7 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-twadhvfl + tag: dev-5hfdy7mc replicaCount: 1 hpa: enabled: false From 736733ed4d5a0b97b52d33cdb03aa47235522e3d Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Thu, 25 Jun 2020 01:18:39 +0100 Subject: [PATCH 58/64] Delete manifest-test-flux.yml --- manifeste/manifest-test-flux.yml | 43 -------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 manifeste/manifest-test-flux.yml diff --git a/manifeste/manifest-test-flux.yml b/manifeste/manifest-test-flux.yml deleted file mode 100644 index 15db7d2edf..0000000000 --- a/manifeste/manifest-test-flux.yml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - creationTimestamp: null - labels: - app: hola-php - name: hola-php - namespace: test-flux -spec: - replicas: 1 - selector: - matchLabels: - app: hola-php - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - app: hola-php - spec: - containers: - - image: nginx:latest - name: gitlab-esp-kube-2trxq - imagePullPolicy: "Always" - resources: {} ---- -apiVersion: v1 -kind: Service -metadata: - creationTimestamp: null - labels: - app: hola-php - name: hola-php - namespace: test-flux -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 80 - nodePort: 32333 - selector: - app: hola-php - type: NodePort From 672cebbe83f563d62276f00c41509935851ab987 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Thu, 25 Jun 2020 01:19:39 +0100 Subject: [PATCH 59/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 0cbd44c3e0..867cdc0a9a 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -6,7 +6,7 @@ metadata: name: nginx-red namespace: obs spec: - replicas: 3 + replicas: 2 selector: matchLabels: run: nginx-red From 14de4a9715ee2b93c4dd40c7c7885466612d6445 Mon Sep 17 00:00:00 2001 From: soufiane makhloufi <45273948+soufianem370@users.noreply.github.com> Date: Thu, 25 Jun 2020 01:22:28 +0100 Subject: [PATCH 60/64] Update nginx-red.yaml --- manifeste/nginx-red.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml index 867cdc0a9a..49c0dd806e 100644 --- a/manifeste/nginx-red.yaml +++ b/manifeste/nginx-red.yaml @@ -24,7 +24,7 @@ spec: volumeMounts: - name: webdata mountPath: "/webdata" - command: ["/bin/sh", "-c", 'echo "

I am Red

" > /webdata/index.html'] + command: ["/bin/sh", "-c", 'echo "

I am Red

" > /webdata/index.html'] containers: - image: nginx name: nginx From f441b4d3c1faf7390796bd7c06dcf48d7b648b44 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Jun 2020 14:54:35 +0000 Subject: [PATCH 61/64] add nexus --- manifeste/nexus/nexus-deploy.yml | 34 +++++++++++++++++++++++++++++ manifeste/nexus/nexus-namespace.yml | 5 +++++ manifeste/nexus/nexus-pvc.yml | 13 +++++++++++ manifeste/nexus/nexus-svc.yml | 17 +++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 manifeste/nexus/nexus-deploy.yml create mode 100644 manifeste/nexus/nexus-namespace.yml create mode 100644 manifeste/nexus/nexus-pvc.yml create mode 100644 manifeste/nexus/nexus-svc.yml diff --git a/manifeste/nexus/nexus-deploy.yml b/manifeste/nexus/nexus-deploy.yml new file mode 100644 index 0000000000..e30ed699c4 --- /dev/null +++ b/manifeste/nexus/nexus-deploy.yml @@ -0,0 +1,34 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nexus + namespace: devops-tools +spec: + replicas: 1 + selector: + matchLabels: + app: nexus-server + template: + metadata: + labels: + app: nexus-server + spec: + containers: + - name: nexus + image: sonatype/nexus3:latest + resources: + limits: + memory: "4Gi" + cpu: "1000m" + requests: + memory: "2Gi" + cpu: "500m" + ports: + - containerPort: 8081 + volumeMounts: + - name: nexus-data + mountPath: /nexus-data + volumes: + - name: nexus-data + persistentVolumeClaim: + claimName: nexus-pvc diff --git a/manifeste/nexus/nexus-namespace.yml b/manifeste/nexus/nexus-namespace.yml new file mode 100644 index 0000000000..484aaf5d53 --- /dev/null +++ b/manifeste/nexus/nexus-namespace.yml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: devops-tools diff --git a/manifeste/nexus/nexus-pvc.yml b/manifeste/nexus/nexus-pvc.yml new file mode 100644 index 0000000000..756c81e279 --- /dev/null +++ b/manifeste/nexus/nexus-pvc.yml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: nexus-pvc + namespace: devops-tools +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + resources: + requests: + storage: 8Gi + storageClassName: nfs-client diff --git a/manifeste/nexus/nexus-svc.yml b/manifeste/nexus/nexus-svc.yml new file mode 100644 index 0000000000..8df8264982 --- /dev/null +++ b/manifeste/nexus/nexus-svc.yml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: nexus-service + namespace: devops-tools + annotations: + prometheus.io/scrape: 'true' + prometheus.io/path: / + prometheus.io/port: '8081' +spec: + selector: + app: nexus-server + type: NodePort + ports: + - port: 8081 + targetPort: 8081 + nodePort: 32000 From f1dc48e0c4be66fa4cf86d8478fe3d2fbf2c65b7 Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Tue, 30 Jun 2020 17:43:53 +0000 Subject: [PATCH 62/64] Auto-release soufianem370/podinfo:0.4.10 --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 3df4f72270..28afcb9c9e 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -16,5 +16,5 @@ spec: values: image: repository: soufianem370/podinfo - tag: dev-qsm7vwwf + tag: 0.4.10 replicaCount: 3 From 6f488fc3537e394bab879611f829ecf56097f71c Mon Sep 17 00:00:00 2001 From: Weave Flux Date: Tue, 30 Jun 2020 17:56:47 +0000 Subject: [PATCH 63/64] Auto-release soufianem370/podinfo:0.4.11 --- releases/prod/podinfo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 28afcb9c9e..c94a50b78b 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -16,5 +16,5 @@ spec: values: image: repository: soufianem370/podinfo - tag: 0.4.10 + tag: 0.4.11 replicaCount: 3 From dd13730b6d2953340607c307e731f320a5a9ef39 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 30 Jun 2020 18:05:11 +0000 Subject: [PATCH 64/64] rollback v10 --- hack/ci-mock.sh | 2 +- releases/prod/podinfo.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 hack/ci-mock.sh diff --git a/hack/ci-mock.sh b/hack/ci-mock.sh old mode 100644 new mode 100755 index 97729564a5..2d194e23a4 --- a/hack/ci-mock.sh +++ b/hack/ci-mock.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -repository="stefanprodan/podinfo" +repository="soufianem370/podinfo" branch="master" version="" commit=$(cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1 | awk '{print tolower($0)}') diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index c94a50b78b..28afcb9c9e 100644 --- a/releases/prod/podinfo.yaml +++ b/releases/prod/podinfo.yaml @@ -16,5 +16,5 @@ spec: values: image: repository: soufianem370/podinfo - tag: 0.4.11 + tag: 0.4.10 replicaCount: 3