Skip to content

Upgrade helm chart #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IAM.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ The Policy required to deploy this module:
"container.clusters.get"
]
}
```
```
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## argocd

![squareops_avatar]

[squareops_avatar]: https://squareops.com/wp-content/uploads/2022/12/squareops-logo.png
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://squareops.com/wp-content/uploads/2020/05/Squareops-png-white.png1-3.png">
<source media="(prefers-color-scheme: light)" srcset="https://squareops.com/wp-content/uploads/2021/09/Squareops-png-1-1.png">
<img src="https://squareops.com/wp-content/uploads/2021/09/Squareops-png-1-1.png">
</picture>

### [SquareOps Technologies](https://squareops.com/) Your DevOps Partner for Accelerating cloud journey.
<br>
Expand All @@ -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
Expand Down Expand Up @@ -71,14 +73,14 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_argocd_config"></a> [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` | <pre>{<br> "argocd_notifications_enabled": false,<br> "autoscaling_enabled": false,<br> "hostname": "",<br> "redis_ha_enabled": false,<br> "slack_notification_token": "",<br> "values_yaml": ""<br>}</pre> | no |
| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Version of the Argocd chart that will be used to deploy Argocd application. | `string` | `"5.53.11"` | no |
| <a name="input_helm_chart_version"></a> [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 |
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Name of the Kubernetes namespace where the Argocd deployment will be deployed. | `string` | `"argocd"` | no |

## Outputs

| Name | Description |
|------|-------------|
| <a name="output_argocd"></a> [argocd](#output\_argocd) | Argocd\_Info |
| <a name="output_argocd"></a> [argocd](#output\_argocd) | Information about the ArgoCD, including the username, password, and URL. |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

## Contribution & Issue Reporting
Expand Down
36 changes: 35 additions & 1 deletion examples/complete/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,38 @@ No inputs.
| Name | Description |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info |
<!-- END_TF_DOCS -->
<!-- END_TF_DOCS -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Requirements

No requirements.

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_argocd"></a> [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 |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Information about the ArgoCD, including the username, password, and URL. |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
14 changes: 7 additions & 7 deletions examples/complete/aws/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ controller:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -22,7 +22,7 @@ repoServer:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -48,7 +48,7 @@ notifications:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -67,7 +67,7 @@ server:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -87,7 +87,7 @@ redis:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -107,7 +107,7 @@ dex:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
Expand All @@ -127,7 +127,7 @@ applicationSet:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "cicd-services"
- key: "Addons-Services"
operator: In
values:
- "true"
9 changes: 5 additions & 4 deletions examples/complete/aws/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
locals {
region = "us-east-2"
region = "ap-south-1"
additional_tags = {
Owner = "organization_name"
Expires = "Never"
Expand All @@ -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
}
}
2 changes: 1 addition & 1 deletion examples/complete/aws/output.tf
Original file line number Diff line number Diff line change
@@ -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."
}
4 changes: 2 additions & 2 deletions examples/complete/aws/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}


Expand Down
35 changes: 34 additions & 1 deletion examples/complete/azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,37 @@ No inputs.
| Name | Description |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info |
<!-- END_TF_DOCS -->
<!-- END_TF_DOCS -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Requirements

No requirements.

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_argocd"></a> [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 |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/complete/azure/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ redis:
- key: "Addons-Services"
operator: In
values:
- "true"
- "true"
36 changes: 35 additions & 1 deletion examples/complete/gcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,38 @@ No inputs.
| Name | Description |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info |
<!-- END_TF_DOCS -->
<!-- END_TF_DOCS -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Requirements

No requirements.

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | n/a |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_argocd"></a> [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 |
|------|-------------|
| <a name="output_argocd_credentials"></a> [argocd\_credentials](#output\_argocd\_credentials) | Argocd\_Info |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2 changes: 1 addition & 1 deletion examples/complete/gcp/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
4 changes: 2 additions & 2 deletions helm/values/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion output.tf
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
4 changes: 2 additions & 2 deletions variable.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}

Expand Down