Merge pull request #2002 from oracle-devrel/oke-gitops

Oke gitops

Author: martatolosa

app-dev/devops-and-containers/oke/oke-gitops/modules/devops/build_pipeline.tf

@@ -25,7 +25,7 @@ resource "oci_devops_build_pipeline_stage" "mirror_argocd_stage" {
   display_name = "Mirror Helm Chart"
   description = "Stage to import a public Helm Chart into the tenancy Oracle Container Registry"
   primary_build_source = "pipelines"
-  image = "OL7_X86_64_STANDARD_10"
+  image = "OL8_X86_64_STANDARD_10"
   stage_execution_timeout_in_seconds = 36000
 }
 

app-dev/devops-and-containers/oke/oke-gitops/modules/devops/repositories.tf

@@ -47,16 +47,16 @@ resource "null_resource" "push_pipelines_repo_content" {
 }
 
 
-resource "oci_devops_repository" "argo_repo" {
-  name       = "oke-cluster-config"
+resource "oci_devops_repository" "system_config_repo" {
+  name       = "system-cluster-config"
   project_id = oci_devops_project.devops_project.id
-  description = "Repository containing Kubernetes cluster configurations"
+  description = "Repository containing Kubernetes cluster configurations, to be used by cluster admins"
   repository_type = "HOSTED"
 }
 
 data "archive_file" "cluster_config_archive" {
-  output_path = "oke-cluster-config.zip"
-  source_dir = "${path.root}/repos/oke-cluster-config"
+  output_path = "system-cluster-config.zip"
+  source_dir = "${path.root}/repos/system-cluster-config"
   type        = "zip"
 }
 
@@ -65,17 +65,50 @@ resource "null_resource" "push_cluster_config_repo_content" {
   provisioner "local-exec" {
     command = "chmod +x ./script/push_repo.sh && ./script/push_repo.sh"
     environment = {
-      REPO_CLONE_URL = oci_devops_repository.argo_repo.http_url
+      REPO_CLONE_URL = oci_devops_repository.system_config_repo.http_url
       GIT_USERNAME = var.git_username
       GIT_PASSWORD = var.git_password
       REGION = var.region
-      SOURCE_REPO = "/repos/oke-cluster-config"
+      SOURCE_REPO = "/repos/system-cluster-config"
     }
     working_dir = path.root
   }
   triggers = {
     src_hash = data.archive_file.cluster_config_archive.output_sha
-    repo_id = oci_devops_repository.argo_repo.id
+    repo_id = oci_devops_repository.system_config_repo.id
+  }
+  depends_on = [local_file.export_variables]
+}
+
+resource "oci_devops_repository" "apps_config_repo" {
+  name       = "apps-cluster-config"
+  project_id = oci_devops_project.devops_project.id
+  description = "Repository containing Kubernetes application configurations, to be used by developers"
+  repository_type = "HOSTED"
+}
+
+data "archive_file" "apps_config_archive" {
+  output_path = "apps-cluster-config.zip"
+  source_dir = "${path.root}/repos/apps-cluster-config"
+  type        = "zip"
+}
+
+resource "null_resource" "push_apps_config_repo_content" {
+
+  provisioner "local-exec" {
+    command = "chmod +x ./script/push_repo.sh && ./script/push_repo.sh"
+    environment = {
+      REPO_CLONE_URL = oci_devops_repository.apps_config_repo.http_url
+      GIT_USERNAME = var.git_username
+      GIT_PASSWORD = var.git_password
+      REGION = var.region
+      SOURCE_REPO = "/repos/apps-cluster-config"
+    }
+    working_dir = path.root
+  }
+  triggers = {
+    src_hash = data.archive_file.apps_config_archive.output_sha
+    repo_id = oci_devops_repository.apps_config_repo.id
   }
   depends_on = [local_file.export_variables]
 }

app-dev/devops-and-containers/oke/oke-gitops/provider.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = "7.4.0"
+      version = "7.18.0"
     }
     null = {
       source = "hashicorp/null"

app-dev/devops-and-containers/oke/oke-gitops/repos/apps-cluster-config/apps/helm/charts/example-app/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: appsets
+description: An example of a Helm application
+
+type: application
+
+version: 1.0.0
+
+appVersion: "1.0.0"