Skip to content

fix: k8s_callback input structure to match kubernetes-details output schema #332

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.

Sign up for GitHub

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
rauneetverma wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: k8s_callback input structure to match kubernetes-details output schema #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modules/common/k8s_callback/k8s_standard/1.0/facets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
intent: k8s_callback
flavor: k8s_standard
version: '1.1'
version: '1.2'
description: Creates ServiceAccount with admin role and registers OVH K8s credentials
with Facets control plane
intentDetails:
Expand Down Expand Up @@ -29,7 +29,7 @@ spec:
sample:
kind: k8s_callback
flavor: k8s_standard
version: '1.1'
version: '1.2'
disabled: false
spec: {}
iac:
Expand Down
4 changes: 2 additions & 2 deletions modules/common/k8s_callback/k8s_standard/1.0/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ data "kubernetes_secret" "facets_admin_token" {
# Make callback to control plane
resource "null_resource" "add_k8s_creds_backend" {
triggers = {
host = var.inputs.kubernetes_details.cluster_endpoint
host = var.inputs.kubernetes_details.attributes.cluster_endpoint
token = data.kubernetes_secret.facets_admin_token.data["token"]
cluster_id = var.environment.environment_id
}
Expand All @@ -71,7 +71,7 @@ resource "null_resource" "add_k8s_creds_backend" {
curl -X POST "https://$TF_VAR_cc_host/cc/v1/clusters/${var.environment.environment_id}/credentials" \
-H "accept: */*" \
-H "Content-Type: application/json" \
-d "{\"kubernetesApiEndpoint\": \"${var.inputs.kubernetes_details.cluster_endpoint}\", \"kubernetesToken\": \"${data.kubernetes_secret.facets_admin_token.data["token"]}\"}" \
-d "{\"kubernetesApiEndpoint\": \"${var.inputs.kubernetes_details.attributes.cluster_endpoint}\", \"kubernetesToken\": \"${data.kubernetes_secret.facets_admin_token.data["token"]}\"}" \
-H "X-DEPLOYER-INTERNAL-AUTH-TOKEN: $TF_VAR_cc_auth_token"
EOF
}
Expand Down
12 changes: 7 additions & 5 deletions modules/common/k8s_callback/k8s_standard/1.0/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ variable "inputs" {
description = "A map of inputs requested by the module developer."
type = object({
kubernetes_details = object({
cluster_endpoint = optional(string)
cluster_ca_certificate = optional(string)
cluster_name = optional(string)
cluster_version = optional(string)
cluster_id = optional(string)
attributes = object({
cluster_endpoint = optional(string)
cluster_ca_certificate = optional(string)
cluster_name = optional(string)
cluster_version = optional(string)
cluster_id = optional(string)
})
})
})
}
3 changes: 1 addition & 2 deletions project-type/aws/base/k8s_callback/instances/k8s-callback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"inputs": {
"kubernetes_details": {
"resource_name": "cluster",
"resource_type": "kubernetes_cluster",
"output_name": "attributes"
"resource_type": "kubernetes_cluster"
}
}
}
3 changes: 1 addition & 2 deletions project-type/azure/base/k8s_callback/instances/k8s-callback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"inputs": {
"kubernetes_details": {
"resource_name": "cluster",
"resource_type": "kubernetes_cluster",
"output_name": "attributes"
"resource_type": "kubernetes_cluster"
}
}
}
3 changes: 1 addition & 2 deletions project-type/gcp/base/k8s_callback/instances/k8s-callback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"inputs": {
"kubernetes_details": {
"resource_name": "cluster",
"resource_type": "kubernetes_cluster",
"output_name": "attributes"
"resource_type": "kubernetes_cluster"
}
}
}