From aa12ce8fbb45d7ca68c250859977cb3a945c6e5b Mon Sep 17 00:00:00 2001 From: kolosovpetro Date: Sun, 23 Mar 2025 21:57:57 +0100 Subject: [PATCH 1/2] argo cd updates --- argocd/README.md | 15 ++++++++++ argocd/argocd-auth.yaml | 18 ++++++++++++ terraform/.terraform.lock.hcl | 52 +++++++++++++++++------------------ 3 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 argocd/README.md create mode 100644 argocd/argocd-auth.yaml diff --git a/argocd/README.md b/argocd/README.md new file mode 100644 index 0000000..0ca0d18 --- /dev/null +++ b/argocd/README.md @@ -0,0 +1,15 @@ +## Install ArgoCD CLI (Windows) + +- choco install argocd-cli -y +- argocd version + +## Install ArgoCD to the Cluster + +- https://github.com/argoproj/argo-cd +- kubectl create namespace argocd +- kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.14.7/manifests/install.yaml +- kubectl patch svc argocd-server -n argocd --type merge --patch '{"spec": {"type": "LoadBalancer"}}' +- https://argocd-et.razumovsky.me/ +- $Password = kubectl get secret argocd-initial-admin-secret -n argocd -o jsonpath="{.data.password}" | ForEach-Object { [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($_)) } +- argocd login argocd-et.razumovsky.me --username admin --password $Password --insecure +- argocd repo add "https://github.com/EventTriangle/EventTriangleAPI.git" diff --git a/argocd/argocd-auth.yaml b/argocd/argocd-auth.yaml new file mode 100644 index 0000000..cf6db87 --- /dev/null +++ b/argocd/argocd-auth.yaml @@ -0,0 +1,18 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: auth-service + namespace: argocd +spec: + project: default + source: + repoURL: https://github.com/EventTriangle/EventTriangleAPI.git + targetRevision: AZ400-336 + path: kubernetes/auth-deployment-cluster-ip + destination: + server: https://kubernetes.default.svc + namespace: event-triangle + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 9b6fb28..7b8c59d 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -22,42 +22,42 @@ provider "registry.terraform.io/azure/azapi" { } provider "registry.terraform.io/hashicorp/azuread" { - version = "3.1.0" + version = "3.2.0" constraints = ">= 2.43.0" hashes = [ - "h1:sBGDtSwT8Cz4NLBdR+LPPZW0L7kEIzOyvPDjv31COMw=", - "zh:01b796cf12e93cc811cb15c8465605e75de170802060f9e2fe114835968960dd", - "zh:12005fbffb84467ff1d4ce9317370834d1279743bc201d3db95f36315cdf8157", + "h1:DciAAiQWGJK0FR+2Qe/O/NwukMs6nLtVqv19BQY6hU4=", + "zh:063897b38fd6231577c21a751ccd955716bca0e3abcf800a90dd1dd50fb24875", + "zh:19704c38c0cf229dc663e36a3ea53649780b7b5ec3953febbc95d7cb5e1cde27", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:1daf7d4ade44e69593488c1f6571b4fbdaf01ec41538207de1f12609b3830907", - "zh:386965c0529ed083b94968c25441385378d8643a5748591b221e6d6d3cea4dbc", - "zh:46ede0628c300c6d584135daa93733400b9ce968d8aebb3f925d904b3fcfa781", - "zh:7af453bf5217e1818ca5c2126edb8fe573c85f17a0557415a3bc7ae92a8652f5", - "zh:b6014600409715ca37aa85ddb066698f592b7d104f09c12a68d45c5b00404272", - "zh:bca84d10cd1e805e6d31a888eb6737a96aee14e1b5b919dee73d2a5a8ff85beb", - "zh:bd7d6e6c2a086bafdeeb33d5d4f919a8789ef3acf1a0baf2b8ea43996b96c213", - "zh:e5b7840b1b9d90c3f6be9a59400b7d0580376415a79aa740eba7f97bf35c25ef", - "zh:e94e114b205de36d60bc17a3758f9c4bfc6b01e63be81ae1d9699f9bf9650362", + "zh:463c9351c86d161b6c81efd3109d45acec45f4269bf0180a589073eb5ab6b3e1", + "zh:54a1962e9f998f3725d801274fb8e0a1a6ad194e50f599d586aca265ed193934", + "zh:64fafb076204728168a3c369b9412a0c58ee44ac3175d79611626725e812e73a", + "zh:7283c00ca13c7e1a5d2976884a314daed6dea7e5e99e33d8f99eda28b277c12a", + "zh:95a564a55d2ed8cac1299577f7b1671e0f9d13c0429f5e321deabadb0740efed", + "zh:a325b5c5ea1a8188ad51c4d3ffea76362895bc4749c613e2ec5ac807b3ede902", + "zh:b3d58bb47fdb747734fdefef8bb7d08ae45fd8634792d839043ae326f333b33e", + "zh:da1b6043e5615f767b9685ab4cfdffc04e1b5ca808c7c004d83bac75cbc8f465", + "zh:fd5eb49039b7787a1133cbb9f2ba6b0183de10e7ba95aaaaebdee7b50e40c6d9", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "4.22.0" + version = "4.24.0" constraints = ">= 3.71.0" hashes = [ - "h1:8xp/VLfi/NyhkrUvOj91v3vRE1CBpM0QoTrapWreXSs=", - "zh:00c97ee99dd556d1187a7918790d30fb2dd023596781a71c748800a5c3ba47aa", - "zh:23713d8814661ed211dc43c9a5f130fc7bee5fa9956249ff2649a4ade0cb6a6b", - "zh:3b72a837582cf481f33880942f2abb43a7c0ec504005902b019afe4ea1f58fc4", - "zh:5b462c028ce8e494f8e2b70880b3b8c48228871d0b3dd1df19dbc449f015a302", - "zh:631c148e9aa3b084650444b39efaa1d75f51069a349ba4e5111451ac9a3b431b", - "zh:76243dec930b34ed79c53982f2d728f84cece8ea50d2a1a2867ed41caeaec622", - "zh:ac5be3494d1e9cc7e6a99c83b42054b87b6776726660afd420c62f8ea9899ff8", - "zh:bf2b054ad3ed0a0b416edff34faf4cf0b903699985046521c8c06264a01c2c0b", - "zh:ce9833fb5b7de2ef5076b3c5a877f73d0f7cf2cb4ca6f45b8b28cfd975c47a31", - "zh:e2703a53f8b059c7330467ce2268065c10c8ae5dd370bdb62a8be5ecabd801cf", + "h1:QKLE+6C8K98qAoah9gY6H6twDjpFmujoJsw/uMAGp5Y=", + "zh:26cebd201fad0c361e757d8552208106b70fd8dbca3668229ae4eb92fcd69d20", + "zh:33e8929ef07dd515a93027d35b77ad28b9a9fa915d824c028e0df75bcd7ad18a", + "zh:3de012cfbb0e993826a4715a9b94908ab87e48f45a72b2ae87dc770bba1a38bc", + "zh:4d3fd7c389a1768e15ef0ad78fbf2c560d35284fcfb8196d775466bffe4aa8ca", + "zh:88b8979d73ea7f2361df4ae26b64202fac44c0bc1291d8cd4ffb9a605f99d35b", + "zh:95ebe18507cf32fe7cdbc3b8c69f78541be9511070a60d3d925e3ef4df7d7b20", + "zh:9ad4bd9262be7e6ea933ae3ce4696c86129be6b44c44a605e748ef95c897ea76", + "zh:a54609ff7eddf2b0eed9ae67e33c5fcdf94aa838a49d06052bbe632ed5453a91", + "zh:a6bdff023a0d9bc15fadda37b23202ec0f5d6fbb66013dcb70a9ad0f162a86f5", + "zh:cc4c82f23b2fe55126b06c719a8285ecf2cb9dd10b89c7a22af047f940c262e5", + "zh:ed32a4e66aaabb7fa919800a3fdb27bc3181844765f1109824af3a542b84bbf7", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fcfc741bbba7e6eaa825959376f7ab484b8fa0d837450338e871c58b2141794a", ] } From 76ce2c6be11e12dfa30bfc10d1b28d0bdb910fcc Mon Sep 17 00:00:00 2001 From: kolosovpetro Date: Sun, 23 Mar 2025 23:07:28 +0100 Subject: [PATCH 2/2] changelog and readme --- CHANGELOG.md | 2 ++ argocd/README.md | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1d514a..1a011a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,3 +32,5 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec - Merge plan and plan-destroy terraform pipelines - Configure HPA for services - Fix the error Unable to unprotect the message.State. +- ArgoCD initial config +- ArgoCD application manifest diff --git a/argocd/README.md b/argocd/README.md index 0ca0d18..dec39a1 100644 --- a/argocd/README.md +++ b/argocd/README.md @@ -1,11 +1,14 @@ -## Install ArgoCD CLI (Windows) +## ArgoCD project + +- https://github.com/argoproj/argo-cd + +## Install ArgoCD CLI (Windows) - choco install argocd-cli -y - argocd version -## Install ArgoCD to the Cluster +## Install and configure ArgoCD -- https://github.com/argoproj/argo-cd - kubectl create namespace argocd - kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/v2.14.7/manifests/install.yaml - kubectl patch svc argocd-server -n argocd --type merge --patch '{"spec": {"type": "LoadBalancer"}}'