Skip to content
This repository has been archived by the owner on Aug 11, 2021. It is now read-only.

[WIP] Implement local planner #41

Closed
wants to merge 18 commits into from
Closed

[WIP] Implement local planner #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
acccaf7
WIP CRD test
alexsomesan Oct 13, 2020
62cadd8
WIP - fix local planning
alexsomesan May 13, 2020
133b8ac
Fix tests / remove some logging
alexsomesan May 26, 2020
95db4dd
Fix crash from inconsistent list members - move null filtering outsid…
alexsomesan May 26, 2020
f41c118
Remove unnecessary yaml manifest
alexsomesan May 26, 2020
9831623
Update type generator to include workaround for IntOrString types
alexsomesan May 27, 2020
b5a67ee
WIP some progress
alexsomesan Jun 8, 2020
2cbb5c1
mod tidy and vendor
alexsomesan Jun 12, 2020
371eb67
Fix type morphing for dynamic attributes
alexsomesan Jun 13, 2020
e7de449
Vendor localy modified openAPI-cty
alexsomesan Jun 13, 2020
4658f6e
Vendor updates to openapi-cty
alexsomesan Jun 13, 2020
7d2555d
Use type-flexible JSON unmarshaler
alexsomesan Jul 23, 2020
1809710
Update go-cty and openapi-cty with changes needed for local planning.
alexsomesan Jul 23, 2020
fd39176
Remove leftover module override
alexsomesan Jul 23, 2020
f372cb7
Merge logic for create and update (it's the same when using SSA)
alexsomesan Jul 24, 2020
44901f9
'go mod tidy' after rebase
alexsomesan Sep 17, 2020
0e79641
Updates after rebase and use DynamicPseudotype for IntOrString
alexsomesan Oct 14, 2020
f35039a
Update examples with SSP configurable via variable
alexsomesan Oct 14, 2020
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
9 changes: 9 additions & 0 deletions examples/bigcrd/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

320 changes: 320 additions & 0 deletions examples/bigcrd/bigcrd.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,320 @@

variable "server_side_planning" {
type = bool
default = false
}

provider "kubernetes-alpha" {
server_side_planning = var.server_side_planning

config_path = "~/.kube/config"
}

resource "kubernetes_manifest" "workspaces_app_terraform_io_crd" {
provider = kubernetes-alpha

manifest = {
"apiVersion" = "apiextensions.k8s.io/v1"
"kind" = "CustomResourceDefinition"
"metadata" = {
"name" = "workspaces.app.terraform.io"
}
"spec" = {
"group" = "app.terraform.io"
"names" = {
"kind" = "Workspace"
"listKind" = "WorkspaceList"
"plural" = "workspaces"
"singular" = "workspace"
}
"scope" = "Namespaced"
"versions" = [
{
"name" = "v1alpha1"
"schema" = {
"openAPIV3Schema" = {
"description" = "Workspace is the Schema for the workspaces API"
"properties" = {
"apiVersion" = {
"description" = "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
"type" = "string"
}
"kind" = {
"description" = "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
"type" = "string"
}
"metadata" = {
"type" = "object"
}
"spec" = {
"description" = "WorkspaceSpec defines the desired state of Workspace"
"properties" = {
"module" = {
"description" = "Module source and version to use"
"nullable" = true
"properties" = {
"source" = {
"description" = "Any remote module source (version control, registry)"
"type" = "string"
}
"version" = {
"description" = "Module version for registry modules"
"type" = "string"
}
}
"required" = [
"source",
]
"type" = "object"
}
"organization" = {
"description" = "Terraform Cloud organization"
"type" = "string"
}
"outputs" = {
"description" = "Outputs denote outputs wanted"
"items" = {
"description" = "OutputSpec specifies which values need to be output"
"properties" = {
"key" = {
"description" = "Output name"
"type" = "string"
}
"moduleOutputName" = {
"description" = "Attribute name in module"
"type" = "string"
}
}
"type" = "object"
}
"type" = "array"
}
"secretsMountPath" = {
"description" = "File path within operator pod to load workspace secrets"
"type" = "string"
}
"sshKeyID" = {
"description" = "SSH Key ID. This key must already exist in the TF Cloud organization. This can either be the user assigned name of the SSH Key, or the system assigned ID."
"type" = "string"
}
"variables" = {
"description" = "Variables as inputs to module"
"items" = {
"description" = "Variable denotes an input to the module"
"properties" = {
"environmentVariable" = {
"description" = "EnvironmentVariable denotes if this variable should be created as environment variable"
"type" = "boolean"
}
"hcl" = {
"description" = "String input should be an HCL-formatted variable"
"type" = "boolean"
}
"key" = {
"description" = "Variable name"
"type" = "string"
}
"sensitive" = {
"description" = "Variable is a secret and should be retrieved from file"
"type" = "boolean"
}
"value" = {
"description" = "Variable value"
"type" = "string"
}
"valueFrom" = {
"description" = "Source for the variable's value. Cannot be used if value is not empty."
"properties" = {
"configMapKeyRef" = {
"description" = "Selects a key of a ConfigMap."
"properties" = {
"key" = {
"description" = "The key to select."
"type" = "string"
}
"name" = {
"description" = "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?"
"type" = "string"
}
"optional" = {
"description" = "Specify whether the ConfigMap or its key must be defined"
"type" = "boolean"
}
}
"required" = [
"key",
]
"type" = "object"
}
"fieldRef" = {
"description" = "Selects a field of the pod: supports metadata.name, metadata.namespace, metadata.labels, metadata.annotations, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs."
"properties" = {
"apiVersion" = {
"description" = "Version of the schema the FieldPath is written in terms of, defaults to \"v1\"."
"type" = "string"
}
"fieldPath" = {
"description" = "Path of the field to select in the specified API version."
"type" = "string"
}
}
"required" = [
"fieldPath",
]
"type" = "object"
}
"resourceFieldRef" = {
"description" = "Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported."
"properties" = {
"containerName" = {
"description" = "Container name: required for volumes, optional for env vars"
"type" = "string"
}
"divisor" = {
"anyOf" = [
{
"type" = "integer"
},
{
"type" = "string"
},
]
"description" = "Specifies the output format of the exposed resources, defaults to \"1\""
"pattern" = "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$"
"x-kubernetes-int-or-string" = true
}
"resource" = {
"description" = "Required: resource to select"
"type" = "string"
}
}
"required" = [
"resource",
]
"type" = "object"
}
"secretKeyRef" = {
"description" = "Selects a key of a secret in the pod's namespace"
"properties" = {
"key" = {
"description" = "The key of the secret to select from. Must be a valid secret key."
"type" = "string"
}
"name" = {
"description" = "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?"
"type" = "string"
}
"optional" = {
"description" = "Specify whether the Secret or its key must be defined"
"type" = "boolean"
}
}
"required" = [
"key",
]
"type" = "object"
}
}
"type" = "object"
}
}
"required" = [
"environmentVariable",
"key",
"sensitive",
]
"type" = "object"
}
"type" = "array"
}
"vcs" = {
"description" = "Details of the VCS repository we want to connect to the workspace"
"nullable" = true
"properties" = {
"branch" = {
"description" = "The repository branch to use"
"type" = "string"
}
"ingress_submodules" = {
"description" = "Whether submodules should be fetched when cloning the VCS repository (Defaults to false)"
"type" = "boolean"
}
"repo_identifier" = {
"description" = "A reference to your VCS repository in the format org/repo"
"type" = "string"
}
"token_id" = {
"description" = "Token ID of the VCS Connection (OAuth Connection Token) to use"
"type" = "string"
}
}
"required" = [
"repo_identifier",
"token_id",
]
"type" = "object"
}
}
"required" = [
"organization",
"secretsMountPath",
]
"type" = "object"
}
"status" = {
"description" = "WorkspaceStatus defines the observed state of Workspace"
"properties" = {
"outputs" = {
"description" = "Outputs from state file"
"items" = {
"description" = "OutputStatus outputs the values of Terraform output"
"properties" = {
"key" = {
"description" = "Attribute name in module"
"type" = "string"
}
"value" = {
"description" = "Value"
"type" = "string"
}
}
"type" = "object"
}
"type" = "array"
}
"runID" = {
"description" = "Run ID"
"type" = "string"
}
"runStatus" = {
"description" = "Run Status gets the run status"
"type" = "string"
}
"workspaceID" = {
"description" = "Workspace ID"
"type" = "string"
}
}
"required" = [
"runID",
"runStatus",
"workspaceID",
]
"type" = "object"
}
}
"type" = "object"
}
}
"served" = true
"storage" = true
"subresources" = {
"status" = {}
}
},
]
}
}


}
17 changes: 14 additions & 3 deletions examples/configmap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
variable "server_side_planning" {
type = bool
default = false
}

provider "kubernetes-alpha" {
config_path = "~/.kube/config"
server_side_planning = var.server_side_planning

config_path = "~/.kube/config"
}

resource "kubernetes_manifest" "test-configmap" {
provider = kubernetes-alpha
manifest = {
"apiVersion" = "v1"
"kind" = "ConfigMap"
"kind" = "ConfigMap"
"metadata" = {
"name" = "test-config"
"name" = "test-config"
"namespace" = "default"
"labels" = {
"app" = "test-app"
"environment" = "production"
}
}
"data" = {
"foo" = "bar"
Expand Down
12 changes: 11 additions & 1 deletion examples/crd/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
variable "server_side_planning" {
type = bool
default = false
}

provider "kubernetes-alpha" {
server_side_planning = true
server_side_planning = var.server_side_planning
config_path = "~/.kube/config"
}

Expand All @@ -20,8 +25,13 @@ resource "kubernetes_manifest" "test-crd" {
names = {
kind = "TestCrd"
plural = "testcrds"
singular = "testcrd"
listKind = "TestCrds"
}
scope = "Namespaced"
conversion = {
strategy = "None"
}
versions = [{
name = "v1"
served = true
Expand Down
Loading