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 diff --git a/hack/ci-mock.sh b/hack/ci-mock.sh index 97729564a5..2d194e23a4 100755 --- 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/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 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 diff --git a/manifeste/nginx-green.yml b/manifeste/nginx-green.yml new file mode 100644 index 0000000000..43e85339ba --- /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: 2 + 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: {} diff --git a/manifeste/nginx-red.yaml b/manifeste/nginx-red.yaml new file mode 100644 index 0000000000..49c0dd806e --- /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: 2 + 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 + 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 + 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 diff --git a/releases/dev/podinfo.yaml b/releases/dev/podinfo.yaml index 1132031ddc..fd9581f4b9 100644 --- a/releases/dev/podinfo.yaml +++ b/releases/dev/podinfo.yaml @@ -10,13 +10,17 @@ 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 - tag: dev-hdtwcel9 + repository: soufianem370/podinfo + tag: dev-5hfdy7mc replicaCount: 1 hpa: enabled: false + service: + type: LoadBalancer + port: 9898 + diff --git a/releases/prod/podinfo.yaml b/releases/prod/podinfo.yaml index 56d46cc26b..28afcb9c9e 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 - tag: 0.4.11 + repository: soufianem370/podinfo + tag: 0.4.10 replicaCount: 3 diff --git a/releases/stg/podinfo.yaml b/releases/stg/podinfo.yaml index 3ee39da1e6..9e14ad58c2 100644 --- a/releases/stg/podinfo.yaml +++ b/releases/stg/podinfo.yaml @@ -10,13 +10,13 @@ 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 - tag: stg-9ij63o4c + repository: soufianem370/podinfo + tag: dev-eobmcqmy replicaCount: 2 hpa: enabled: true