diff --git a/1-example/application.yaml b/1-example/application.yaml index 332a186..0274a43 100644 --- a/1-example/application.yaml +++ b/1-example/application.yaml @@ -9,7 +9,7 @@ metadata: spec: project: default source: - repoURL: https://github.com/antonputra/lesson-158.git + repoURL: https://git.benadis.ru/gitops/argocd-001.git targetRevision: HEAD path: my-app destination: diff --git a/2-example/application.yaml b/2-example/application.yaml index 7efbc86..2bd1faf 100644 --- a/2-example/application.yaml +++ b/2-example/application.yaml @@ -9,7 +9,7 @@ metadata: spec: project: default source: - repoURL: https://github.com/antonputra/lesson-158.git + repoURL: https://git.benadis.ru/gitops/argocd-001.git targetRevision: HEAD path: environments/staging/apps destination: diff --git a/deploy-pr/README.md b/deploy-pr/README.md new file mode 100644 index 0000000..f3d421e --- /dev/null +++ b/deploy-pr/README.md @@ -0,0 +1 @@ +# lesson-158-private \ No newline at end of file diff --git a/deploy-pr/environments/dev/my-app/kustomization.yaml b/deploy-pr/environments/dev/my-app/kustomization.yaml new file mode 100644 index 0000000..e4ac41e --- /dev/null +++ b/deploy-pr/environments/dev/my-app/kustomization.yaml @@ -0,0 +1,7 @@ +--- +namespace: staging +images: + - name: aputra/nginx + newTag: v0.1.0 +resources: + - ../../../my-app-base diff --git a/deploy-pr/my-app-base/deployment.yaml b/deploy-pr/my-app-base/deployment.yaml new file mode 100644 index 0000000..5fecbd9 --- /dev/null +++ b/deploy-pr/my-app-base/deployment.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + replicas: 1 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + imagePullPolicy: Always + image: aputra/nginx + ports: + - containerPort: 80 diff --git a/deploy-pr/my-app-base/kustomization.yaml b/deploy-pr/my-app-base/kustomization.yaml new file mode 100644 index 0000000..1bb7911 --- /dev/null +++ b/deploy-pr/my-app-base/kustomization.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +metadata: + name: arbitrary +resources: + - deployment.yaml + - namespace.yaml diff --git a/deploy-pr/my-app-base/namespace.yaml b/deploy-pr/my-app-base/namespace.yaml new file mode 100644 index 0000000..05afb83 --- /dev/null +++ b/deploy-pr/my-app-base/namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: default diff --git a/deploy-pr/my-app/0-namespace.yaml b/deploy-pr/my-app/0-namespace.yaml new file mode 100644 index 0000000..6a9b4b2 --- /dev/null +++ b/deploy-pr/my-app/0-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: foo diff --git a/deploy-pr/my-app/1-deployment.yaml b/deploy-pr/my-app/1-deployment.yaml new file mode 100644 index 0000000..c329e35 --- /dev/null +++ b/deploy-pr/my-app/1-deployment.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx + namespace: foo + labels: + app: nginx +spec: + replicas: 1 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + imagePullPolicy: Always + image: aputra/nginx-private:v0.1.0 + ports: + - containerPort: 80 + imagePullSecrets: + - name: dockerconfigjson diff --git a/deploy/apps/my-app.yaml b/deploy/apps/my-app.yaml new file mode 100644 index 0000000..0a5de3a --- /dev/null +++ b/deploy/apps/my-app.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: my-app-foo + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: https://git.benadis.ru/gitops/argocd-001.git + targetRevision: HEAD + path: environments/staging/my-app + destination: + server: https://kubernetes.default.svc + syncPolicy: + automated: + prune: true + selfHeal: true + allowEmpty: false + syncOptions: + - Validate=true + - CreateNamespace=false + - PrunePropagationPolicy=foreground + - PruneLast=true diff --git a/deploy/apps/second-app.yaml b/deploy/apps/second-app.yaml new file mode 100644 index 0000000..3814d6a --- /dev/null +++ b/deploy/apps/second-app.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: second-app-bar + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: https://git.benadis.ru/gitops/argocd-001.git + targetRevision: HEAD + path: environments/staging/second-app + destination: + server: https://kubernetes.default.svc + syncPolicy: + automated: + prune: true + selfHeal: true + allowEmpty: false + syncOptions: + - Validate=true + - CreateNamespace=false + - PrunePropagationPolicy=foreground + - PruneLast=true diff --git a/deploy/my-app/0-namespace.yaml b/deploy/my-app/0-namespace.yaml new file mode 100644 index 0000000..6a9b4b2 --- /dev/null +++ b/deploy/my-app/0-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: foo diff --git a/deploy/my-app/1-deployment.yaml b/deploy/my-app/1-deployment.yaml new file mode 100644 index 0000000..8c806ed --- /dev/null +++ b/deploy/my-app/1-deployment.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx + namespace: foo + labels: + app: nginx +spec: + replicas: 1 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: aputra/nginx:v0.1.3 + ports: + - containerPort: 80 diff --git a/deploy/second-app/0-namespace.yaml b/deploy/second-app/0-namespace.yaml new file mode 100644 index 0000000..2dbf63b --- /dev/null +++ b/deploy/second-app/0-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: bar diff --git a/deploy/second-app/1-deployment.yaml b/deploy/second-app/1-deployment.yaml new file mode 100644 index 0000000..a529751 --- /dev/null +++ b/deploy/second-app/1-deployment.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx + namespace: bar + labels: + app: nginx +spec: + replicas: 1 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: aputra/nginx:v0.1.3 + ports: + - containerPort: 80 diff --git a/lesson-158/environments/staging/apps/my-app.yaml b/lesson-158/environments/staging/apps/my-app.yaml index b1b6890..0a5de3a 100644 --- a/lesson-158/environments/staging/apps/my-app.yaml +++ b/lesson-158/environments/staging/apps/my-app.yaml @@ -9,7 +9,7 @@ metadata: spec: project: default source: - repoURL: https://github.com/antonputra/lesson-158.git + repoURL: https://git.benadis.ru/gitops/argocd-001.git targetRevision: HEAD path: environments/staging/my-app destination: diff --git a/lesson-158/environments/staging/apps/second-app.yaml b/lesson-158/environments/staging/apps/second-app.yaml index be06921..3814d6a 100644 --- a/lesson-158/environments/staging/apps/second-app.yaml +++ b/lesson-158/environments/staging/apps/second-app.yaml @@ -9,7 +9,7 @@ metadata: spec: project: default source: - repoURL: https://github.com/antonputra/lesson-158.git + repoURL: https://git.benadis.ru/gitops/argocd-001.git targetRevision: HEAD path: environments/staging/second-app destination: