feat: Add Kubernetes/IKS support (#304)

Author: bhpratt

README.md

@@ -6,7 +6,7 @@
 [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-This module deploys the following observability agents to a Red Hat OpenShift Container Platform cluster:
+This module deploys the following observability agents to a Red Hat OpenShift Container Platform or Kubernetes cluster:
 
 - [Logging agent](https://cloud.ibm.com/docs/log-analysis?topic=log-analysis-log_analysis_agent)
 - [Monitoring agent](https://cloud.ibm.com/docs/monitoring?topic=monitoring-about-collect-metrics)

chart/logdna-agent/templates/scc.yaml

@@ -1,3 +1,4 @@
+{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints" }}
 kind: SecurityContextConstraints
 apiVersion: security.openshift.io/v1
 metadata:
@@ -52,3 +53,4 @@ volumes:
   - persistentVolumeClaim
   - projected
   - secret
+{{- end }}

chart/sysdig-agent/templates/scc.yaml

@@ -1,3 +1,4 @@
+{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints" }}
 kind: SecurityContextConstraints
 apiVersion: security.openshift.io/v1
 metadata:
@@ -38,3 +39,4 @@ users:
 - system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.metadata.name }}
 volumes:
 - '*'
+{{- end }}

examples/basic/main.tf

@@ -57,6 +57,7 @@ resource "ibm_is_subnet" "testacc_subnet" {
 }
 
 resource "ibm_resource_instance" "cos_instance" {
+  count             = var.is_openshift ? 1 : 0
   name              = "${var.prefix}-cos"
   service           = "cloud-object-storage"
   plan              = "standard"
@@ -68,18 +69,19 @@ resource "ibm_resource_instance" "cos_instance" {
 # Lookup the current default kube version
 data "ibm_container_cluster_versions" "cluster_versions" {}
 locals {
-  default_ocp_version = "${data.ibm_container_cluster_versions.cluster_versions.default_openshift_version}_openshift"
+  default_version = var.is_openshift ? "${data.ibm_container_cluster_versions.cluster_versions.default_openshift_version}_openshift" : data.ibm_container_cluster_versions.cluster_versions.default_kube_version
 }
 
 resource "ibm_container_vpc_cluster" "cluster" {
   name                 = var.prefix
   vpc_id               = ibm_is_vpc.example_vpc.id
-  kube_version         = local.default_ocp_version
+  kube_version         = local.default_version
   flavor               = "bx2.4x16"
   worker_count         = "2"
-  entitlement          = "cloud_pak"
-  cos_instance_crn     = ibm_resource_instance.cos_instance.id
+  entitlement          = var.is_openshift ? "cloud_pak" : null
+  cos_instance_crn     = var.is_openshift ? ibm_resource_instance.cos_instance[0].id : null
   force_delete_storage = true
+  wait_till            = "Normal"
   zones {
     subnet_id = ibm_is_subnet.testacc_subnet.id
     name      = "${var.region}-1"

examples/basic/provider.tf

@@ -26,7 +26,8 @@ provider "kubernetes" {
 
 provider "helm" {
   kubernetes {
-    host  = data.ibm_container_cluster_config.cluster_config.host
-    token = data.ibm_container_cluster_config.cluster_config.token
+    host                   = data.ibm_container_cluster_config.cluster_config.host
+    token                  = data.ibm_container_cluster_config.cluster_config.token
+    cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config.ca_certificate
   }
 }

examples/basic/variables.tf

@@ -4,6 +4,12 @@ variable "ibmcloud_api_key" {
   sensitive   = true
 }
 
+variable "is_openshift" {
+  type        = bool
+  description = "Defines whether this is an OpenShift or Kubernetes cluster"
+  default     = true
+}
+
 variable "prefix" {
   type        = string
   description = "Prefix for name of all resource created by this example"

tests/pr_test.go

@@ -73,3 +73,16 @@ func TestRunUpgrade(t *testing.T) {
 		assert.NotNil(t, output, "Expected some output")
 	}
 }
+
+func TestRunBasicAgentsKubernetes(t *testing.T) {
+	t.Parallel()
+
+	var extTerraformVarsK8s = map[string]interface{}{}
+	extTerraformVarsK8s["is_openshift"] = false
+
+	options := setupOptions(t, "basic-obs-agents-k8s", terraformDirOther, extTerraformVarsK8s)
+
+	output, err := options.RunTestConsistency()
+	assert.Nil(t, err, "This should not have errored")
+	assert.NotNil(t, output, "Expected some output")
+}