diff --git a/IAM.md b/IAM.md index f351605..d48f258 100644 --- a/IAM.md +++ b/IAM.md @@ -47,4 +47,4 @@ The Policy required to deploy this module: "container.clusters.get" ] } -``` \ No newline at end of file +``` diff --git a/README.md b/README.md index 050c03c..d6ccd3c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ ## argocd -![squareops_avatar] - -[squareops_avatar]: https://squareops.com/wp-content/uploads/2022/12/squareops-logo.png + + + + + ### [SquareOps Technologies](https://squareops.com/) Your DevOps Partner for Accelerating cloud journey.
@@ -16,7 +18,7 @@ This module is compatible with EKS, AKS & GKE which is great news for users depl | Argocd Helm Chart Version | K8s supported version (EKS, AKS & GKE) | | :-----: | :--- | -| **5.53.11** | **1.23,1.24,1.25,1.26,1.27** | +| **6.7.3** | **1.23,1.24,1.25,1.26,1.27,1.28** | ## Usage Example @@ -71,14 +73,14 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [argocd\_config](#input\_argocd\_config) | Specify the configuration settings for Argocd, including the hostname, redis\_ha\_enabled, autoscaling, notification settings, and custom YAML values. | `any` | 
{
  "argocd_notifications_enabled": false,
  "autoscaling_enabled": false,
  "hostname": "",
  "redis_ha_enabled": false,
  "slack_notification_token": "",
  "values_yaml": ""
}
| no | -| [chart\_version](#input\_chart\_version) | Version of the Argocd chart that will be used to deploy Argocd application. | `string` | `"5.53.11"` | no | +| [helm\_chart\_version](#input\_helm\_chart\_version) | Version of the Argocd chart that will be used to deploy Argocd application. | `string` | `"6.7.3"` | no | | [namespace](#input\_namespace) | Name of the Kubernetes namespace where the Argocd deployment will be deployed. | `string` | `"argocd"` | no | ## Outputs | Name | Description | |------|-------------| -| [argocd](#output\_argocd) | Argocd\_Info | +| [argocd](#output\_argocd) | Information about the ArgoCD, including the username, password, and URL. | ## Contribution & Issue Reporting diff --git a/examples/complete/aws/README.md b/examples/complete/aws/README.md index 7a04514..3032040 100644 --- a/examples/complete/aws/README.md +++ b/examples/complete/aws/README.md @@ -32,4 +32,38 @@ No inputs. | Name | Description | |------|-------------| | [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info | - \ No newline at end of file + + +## Requirements + +No requirements. + +## Providers + +| Name | Version | +|------|---------| +| [aws](#provider\_aws) | n/a | + +## Modules + +| Name | Source | Version | +|------|--------|---------| +| [argocd](#module\_argocd) | ../../../ | n/a | + +## Resources + +| Name | Type | +|------|------| +| [aws_eks_cluster.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source | +| [aws_eks_cluster_auth.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source | + +## Inputs + +No inputs. + +## Outputs + +| Name | Description | +|------|-------------| +| [argocd\_credentials](#output\_argocd\_credentials) | Information about the ArgoCD, including the username, password, and URL. | + diff --git a/examples/complete/aws/helm/values.yaml b/examples/complete/aws/helm/values.yaml index e394804..f56d2e8 100644 --- a/examples/complete/aws/helm/values.yaml +++ b/examples/complete/aws/helm/values.yaml @@ -12,7 +12,7 @@ controller: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -22,7 +22,7 @@ repoServer: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -48,7 +48,7 @@ notifications: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -67,7 +67,7 @@ server: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -87,7 +87,7 @@ redis: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -107,7 +107,7 @@ dex: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" @@ -127,7 +127,7 @@ applicationSet: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "cicd-services" + - key: "Addons-Services" operator: In values: - "true" diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf index 5cba2fe..811b23d 100644 --- a/examples/complete/aws/main.tf +++ b/examples/complete/aws/main.tf @@ -1,5 +1,5 @@ locals { - region = "us-east-2" + region = "ap-south-1" additional_tags = { Owner = "organization_name" Expires = "Never" @@ -9,13 +9,14 @@ locals { } module "argocd" { - source = "squareops/argocd/kubernetes" + # source = "squareops/argocd/kubernetes" + source = "../../../" argocd_config = { - hostname = "argocd.prod.in" + hostname = "argocd-test.ldc.squareops.in" values_yaml = file("./helm/values.yaml") redis_ha_enabled = true autoscaling_enabled = true - slack_notification_token = "" + slack_notification_token = "xoxb-379541400966-iibMHnnoaPzVl" argocd_notifications_enabled = true } } diff --git a/examples/complete/aws/output.tf b/examples/complete/aws/output.tf index b9ae7b9..8927931 100644 --- a/examples/complete/aws/output.tf +++ b/examples/complete/aws/output.tf @@ -1,4 +1,4 @@ output "argocd_credentials" { value = module.argocd.argocd - description = "Argocd_Info" + description = "Information about the ArgoCD, including the username, password, and URL." } diff --git a/examples/complete/aws/provider.tf b/examples/complete/aws/provider.tf index 82ac4d9..5ec118a 100644 --- a/examples/complete/aws/provider.tf +++ b/examples/complete/aws/provider.tf @@ -6,11 +6,11 @@ provider "aws" { } data "aws_eks_cluster" "cluster" { - name = "" + name = "test-rachit" } data "aws_eks_cluster_auth" "cluster" { - name = "" + name = "test-rachit" } diff --git a/examples/complete/azure/README.md b/examples/complete/azure/README.md index df4855d..3abcabe 100644 --- a/examples/complete/azure/README.md +++ b/examples/complete/azure/README.md @@ -32,4 +32,37 @@ No inputs. | Name | Description | |------|-------------| | [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info | - \ No newline at end of file + + +## Requirements + +No requirements. + +## Providers + +| Name | Version | +|------|---------| +| [azurerm](#provider\_azurerm) | n/a | + +## Modules + +| Name | Source | Version | +|------|--------|---------| +| [argocd](#module\_argocd) | squareops/argocd/kubernetes | n/a | + +## Resources + +| Name | Type | +|------|------| +| [azurerm_kubernetes_cluster.primary](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/kubernetes_cluster) | data source | + +## Inputs + +No inputs. + +## Outputs + +| Name | Description | +|------|-------------| +| [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info | + diff --git a/examples/complete/azure/helm/values.yaml b/examples/complete/azure/helm/values.yaml index 7d5486c..134767c 100644 --- a/examples/complete/azure/helm/values.yaml +++ b/examples/complete/azure/helm/values.yaml @@ -53,4 +53,4 @@ redis: - key: "Addons-Services" operator: In values: - - "true" \ No newline at end of file + - "true" diff --git a/examples/complete/gcp/README.md b/examples/complete/gcp/README.md index 7dab93b..1e5db13 100644 --- a/examples/complete/gcp/README.md +++ b/examples/complete/gcp/README.md @@ -32,4 +32,38 @@ No inputs. | Name | Description | |------|-------------| | [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info | - \ No newline at end of file + + +## Requirements + +No requirements. + +## Providers + +| Name | Version | +|------|---------| +| [google](#provider\_google) | n/a | + +## Modules + +| Name | Source | Version | +|------|--------|---------| +| [argocd](#module\_argocd) | squareops/argocd/kubernetes | n/a | + +## Resources + +| Name | Type | +|------|------| +| [google_client_config.default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config) | data source | +| [google_container_cluster.primary](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/container_cluster) | data source | + +## Inputs + +No inputs. + +## Outputs + +| Name | Description | +|------|-------------| +| [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info | + diff --git a/examples/complete/gcp/provider.tf b/examples/complete/gcp/provider.tf index 686255d..d08fdf6 100644 --- a/examples/complete/gcp/provider.tf +++ b/examples/complete/gcp/provider.tf @@ -18,4 +18,4 @@ provider "helm" { token = data.google_client_config.default.access_token cluster_ca_certificate = base64decode(data.google_container_cluster.primary.master_auth.0.cluster_ca_certificate) } -} \ No newline at end of file +} diff --git a/helm/values/values.yaml b/helm/values/values.yaml index 5b85c9c..d122516 100644 --- a/helm/values/values.yaml +++ b/helm/values/values.yaml @@ -104,7 +104,7 @@ server: enabled: ${autoscaling_enabled} ingress: enabled: true - hosts: [${hostname}] + hostname: ${hostname} annotations: kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" @@ -113,7 +113,7 @@ server: nginx.ingress.kubernetes.io/ssl-passthrough: "true" tls: - secretName: argocd-tls - hosts: + hostname: - ${hostname} podAnnotation: co.elastic.logs/enabled: "true" diff --git a/main.tf b/main.tf index 00f83a8..39770b6 100644 --- a/main.tf +++ b/main.tf @@ -9,7 +9,7 @@ resource "helm_release" "argocd_deploy" { name = "argo-cd" chart = "argo-cd" timeout = 600 - version = var.chart_version + version = var.helm_chart_version namespace = var.namespace repository = "https://argoproj.github.io/argo-helm" values = [ diff --git a/output.tf b/output.tf index ff687ed..e7bc263 100644 --- a/output.tf +++ b/output.tf @@ -1,5 +1,5 @@ output "argocd" { - description = "Argocd_Info" + description = "Information about the ArgoCD, including the username, password, and URL." value = { username = "admin", password = nonsensitive(data.kubernetes_secret.argocd-secret.data.password), diff --git a/variable.tf b/variable.tf index 82ed885..c26939c 100644 --- a/variable.tf +++ b/variable.tf @@ -11,9 +11,9 @@ variable "argocd_config" { description = "Specify the configuration settings for Argocd, including the hostname, redis_ha_enabled, autoscaling, notification settings, and custom YAML values." } -variable "chart_version" { +variable "helm_chart_version" { type = string - default = "5.53.11" + default = "6.7.3" description = "Version of the Argocd chart that will be used to deploy Argocd application." }