precommit test

cloudbees · Feb 15, 2024 · b5a8382 · b5a8382
1 parent 61502d3
commit b5a8382
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/blueprints/01-getting-started/README.md b/blueprints/01-getting-started/README.md
@@ -26,7 +26,7 @@ Get started with the [CloudBees CD on Modern in EKS](https://docs.cloudbees.com/
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| hosted_zone | Route 53 Hosted Zone. CloudBees CD Apps is configured to use subdomains in this Hosted Zone. | `string` | n/a | yes |
+| hosted_zone | Route 53 Hosted Zone. CloudBees CD Apps is configured to use this hosted zone. | `string` | n/a | yes |
 | suffix | Unique suffix to be assigned to all resources | `string` | `""` | no |
 | tags | Tags to apply to resources | `map(string)` | `{}` | no |
 
@@ -36,13 +36,9 @@ Get started with the [CloudBees CD on Modern in EKS](https://docs.cloudbees.com/
 |------|-------------|
 | acm_certificate_arn | ACM certificate ARN |
 | cbcd_helm | Helm configuration for CloudBees CD Add-on. It is accesible only via state files. |
-| cbcd_initial_admin_password | Operation Center Service Initial Admin Password for CloudBees CD Add-on. |
-| cbcd_liveness_probe_ext | Operation Center Service External Liveness Probe for CloudBees CD Add-on. |
-| cbcd_liveness_probe_int | Operation Center Service Internal Liveness Probe for CloudBees CD Add-on. |
 | cbcd_namespace | Namespace for CloudBees CD Add-on. |
-| cbcd_oc_ing | Operation Center Ingress for CloudBees CD Add-on. |
-| cbcd_oc_pod | Operation Center Pod for CloudBees CD Add-on. |
-| cbcd_oc_url | URL of the CloudBees CD Operations Center for CloudBees CD Add-on. |
+| cbcd_password | command to get the admin password of Cloudbees CD |
+| cbcd_url | URL of the CloudBees CD Operations Center for CloudBees CD Add-on. |
 | eks_cluster_arn | EKS cluster ARN |
 | kubeconfig_add | Add Kubeconfig to local configuration to access the K8s API. |
 | kubeconfig_export | Export KUBECONFIG environment variable to access to access the K8s API. |

diff --git a/blueprints/01-getting-started/k8s/kubeconfig_cbcd-bp01-swen-demo.yaml b/blueprints/01-getting-started/k8s/kubeconfig_cbcd-bp01-swen-demo.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: 
+      LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJSWRxZ0JMUVA2dGt3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TkRBeU1USXdPVFV5TkRoYUZ3MHpOREF5TURrd09UVTNORGhhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUURHeWpsdmdjZFpFS29RV2ZSVm12NVZvZm9JbHVkb0RBOGtheVFCQzZlUWRUa2lBbmdaTUE2UWNvbTEKa0xGdkMraUtvQ21yc1d1QTNTa0JSZkM1K1U0Qk9NWWp3dXdCU0lTS0hlWGRIOVl5OURDLzRTUkZycXBpYnNBUwpuWm9kb29BT1I1ZVZHbnpyZnBrWk1EUWNscktYZWlzNGhWU3lQc1M4eG1FOVd5TkVodXRYcE9Bc1VUMStoU3V5CllmQmlnczBWV2pIRk9rbERSSE1jc0Q3dXVudVQ1LzVBcmNqRmhDUktLYmoyeGk3eHVoNjZHYVVTMXkwTUNHSG4KcXNDTlo2SWdJQWJqZ2NVZlgxeDZvS0J1VGphZm9udXd5TDlUMzNaZlh1bXc3RjM4YVdCWmhWZDRNWk1icTVwNwpJSGRTYk1VWXBHQmpqVmZMSEpUaUUwWWZ3SmE3QWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRUDV1eE4wVVMwTWhDRUxVMTRWWmFNWkZvcVhUQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ3BaR1B2SUc2agprUnUwcFRVRkp3RXE4M2FUcHdzWlFHWStqcE1qUEttbDBTNXIxWU56RHhZN2Y2MUdyTC9KR1JYVWhqSXdoblIyCkNUVXZYaWVKSFRyVWpHV3p3UmZmaWVEc0tJZ2tYODlEanY0LzRMdmFpc2Z4S1BkRDhiM0dFNXkwN0luaHJ5cG0Ka3JFa1VHOC9yUDJ4eDJvSVoreUU2WC9oMWxtaytFcUZSSUZ6V2d6Q1hjNEpwTlo4MXpuMytNNC80RlY3Umk1egoveTNVRGRHNCtubS9SSnJEeDgreUpRb3hLRzhJSHhRSVpRTmlFcUtra1l0VDYrR054aUt6dk51dFdRMjI3bGdQCjc3QTBLOUNxUGkwa3V3amdTdjRtN1p0anZOUEU3SlBicURBWTZvT1VVRXdiK3hFS2R2K1I1eVZPZFJ5dXpkVG0KS08reUd2UmtjRmJaCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    server: https://46A1031476E308FDD40DAB5253ADA68C.gr7.us-east-1.eks.amazonaws.com
+  name: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+contexts:
+- context:
+    cluster: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+    user: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+  name: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+current-context: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+kind: Config
+preferences: {}
+users:
+- name: arn:aws:eks:us-east-1:324005994172:cluster/cbcd-bp01-swen-demo-eks
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1beta1
+      args:
+      - --region
+      - us-east-1
+      - eks
+      - get-token
+      - --cluster-name
+      - cbcd-bp01-swen-demo-eks
+      - --output
+      - json
+      command: aws
diff --git a/blueprints/01-getting-started/main.tf b/blueprints/01-getting-started/main.tf
@@ -38,8 +38,8 @@ locals {
 module "eks_blueprints_addon_cbcd" {
   source = "../../"
 
-  host_name  = "cd.${var.hosted_zone}"
-  cert_arn     = module.acm.acm_certificate_arn
+  host_name = "cd.${var.hosted_zone}"
+  cert_arn  = module.acm.acm_certificate_arn
 
   depends_on = [
     module.eks_blueprints_addons

diff --git a/blueprints/01-getting-started/outputs.tf b/blueprints/01-getting-started/outputs.tf
@@ -27,7 +27,7 @@ output "cbcd_url" {
 
 output "cbcd_password" {
   description = "command to get the admin password of Cloudbees CD"
-  value = "kubectl get secret --namespace ${module.eks_blueprints_addon_cbcd.cbcd_namespace} cloudbees-cd-cloudbees-flow-credentials -o jsonpath='{.data.CBF_SERVER_ADMIN_PASSWORD}' | base64 --decode; echo"
+  value       = "kubectl get secret --namespace ${module.eks_blueprints_addon_cbcd.cbcd_namespace} cloudbees-cd-cloudbees-flow-credentials -o jsonpath='{.data.CBF_SERVER_ADMIN_PASSWORD}' | base64 --decode; echo"
 }
 
 output "acm_certificate_arn" {