Skip to content

Commit f882f9d

Browse files
author
Victor Getz
committed
Update template
1 parent d8c740a commit f882f9d

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

.envrc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,25 @@ YELLOW='\033[0;33m'
44
export TF_VAR_email="REPLACE_ME" # example: mymail@mail.de
55

66
# ArgoCD access token config, see Readme.md -> Preparation & Requirements -> Point 3
7-
export TF_VAR_git_token="REPLACE_ME"
8-
export TF_VAR_argocd_bootstrap_project_url="REPLACE_ME" # for example https://github.com/victorgetz/otc-infrastructure-charts
7+
export TF_VAR_argocd_bootstrap_project_url="REPLACE_ME" # for example https://github.com/victorgetz/otc-infrastructure-charts.git
98

109
# Dockerhub credentials see Readme.md -> Preparation & Requirements -> Point 6
1110
export TF_VAR_dockerhub_username="REPLACE_ME"
12-
export TF_VAR_dockerhub_password="REPLACE_ME"
1311

1412
#informations from the credentials e-mail
1513
export OS_DOMAIN_NAME="REPLACE_ME" # See E-Mail with credentials (OS_DOMAIN_NAME)
1614
export OS_PROJECT_NAME="REPLACE_ME" # See E-Mail with credentials (OS_PROJECT_NAME)
1715
export TF_VAR_context="REPLACE_ME" # See E-Mail with credentials (TF_VAR_context)
1816
export OS_USERNAME="REPLACE_ME" # See E-Mail with credentials (OS_USERNAME)
19-
export OS_PASSWORD='REPLACE_ME' # See E-Mail with credentials (OS_PASSWORD)
2017

2118
export TF_VAR_region="eu-de"
2219
export REGION=$TF_VAR_region
2320
export TF_VAR_os_domain_name="${OS_DOMAIN_NAME}"
2421
export TF_VAR_stage="dev"
2522
export TF_VAR_domain_name="${TF_VAR_context}.iits.tech"
2623

24+
source ./my-secrets.sh
25+
2726
echo -e "${YELLOW}INFO: You need to install otc-auth with Version >2.0.0${NO_COLOR}"
2827
otc-auth login iam --overwrite-token
2928
otc-auth openstack config-create

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@ build
4848
/**/.terraform/environment
4949
/**/terraform.tfvars
5050
/**/*.backup
51-
**/requirements.lock
51+
**/requirements.lock
52+
53+
./my-secrets.sh

my-secrets.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export TF_VAR_git_token="REPLACE_ME"
2+
export TF_VAR_dockerhub_password="REPLACE_ME"
3+
export OS_PASSWORD='REPLACE_ME' # See E-Mail with credentials (OS_PASSWORD)

otc-cloud/dev/kubernetes/settings.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "v1.3.5"
2+
required_version = ">=v1.3.5"
33

44
backend "s3" {
55
//TODO
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
kubernetes = {
1414
source = "hashicorp/kubernetes"
15-
version = "2.10.0"
15+
version = "2.16.0"
1616
}
1717
helm = {
1818
source = "hashicorp/helm"

otc-cloud/dev/kubernetes/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ locals {
2020
chart_versions = {
2121
otc_storage_classes = "2.0.2"
2222
crds = "1.5.0"
23-
argo = "5.30.1-add-helm-registries"
23+
argo = "15.0.1"
2424
kyverno = "1.2.1"
2525
iits_kyverno_policies = "1.5.0"
2626
}

otc-cloud/dev/settings.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "v1.3.5"
2+
required_version = ">=v1.3.5"
33
backend "s3" {
44
//TODO
55
}

0 commit comments

Comments
 (0)