diff --git a/apps/values.yaml b/apps/values.yaml index 60c20ec..3a14248 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -23,7 +23,6 @@ applications: - name: helm-hooks - name: jsonnet-guestbook - name: jsonnet-guestbook-tla - - name: ksonnet-guestbook - name: kustomize-guestbook - name: plugin-kasane path: plugins/kasane diff --git a/ksonnet-guestbook/.gitignore b/ksonnet-guestbook/.gitignore deleted file mode 100644 index f8714d3..0000000 --- a/ksonnet-guestbook/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/lib -/.ksonnet/registries -/app.override.yaml -/.ks_environment diff --git a/ksonnet-guestbook/app.yaml b/ksonnet-guestbook/app.yaml deleted file mode 100644 index 6fc0b6a..0000000 --- a/ksonnet-guestbook/app.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: 0.1.0 -environments: - default: - destination: - namespace: default - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: default - dev: - destination: - namespace: dev - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: dev - prod: - destination: - namespace: prod - server: https://kubernetes.default.svc - k8sVersion: v1.10.0 - path: prod -kind: ksonnet.io/app -name: guestbook -version: 0.0.1 diff --git a/ksonnet-guestbook/components/guestbook-ui.jsonnet b/ksonnet-guestbook/components/guestbook-ui.jsonnet deleted file mode 100644 index b615bdb..0000000 --- a/ksonnet-guestbook/components/guestbook-ui.jsonnet +++ /dev/null @@ -1,59 +0,0 @@ -local env = std.extVar("__ksonnet/environments"); -local params = std.extVar("__ksonnet/params").components["guestbook-ui"]; -[ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "name": params.name - }, - "spec": { - "ports": [ - { - "port": params.servicePort, - "targetPort": params.containerPort - } - ], - "selector": { - "app": params.name - }, - "type": params.type - } - }, - { - "apiVersion": "apps/v1", - "kind": "Deployment", - "metadata": { - "name": params.name - }, - "spec": { - "replicas": params.replicas, - "revisionHistoryLimit": 3, - "selector": { - "matchLabels": { - "app": params.name - }, - }, - "template": { - "metadata": { - "labels": { - "app": params.name - } - }, - "spec": { - "containers": [ - { - "image": params.image, - "name": params.name, - "ports": [ - { - "containerPort": params.containerPort - } - ] - } - ] - } - } - } - } -] diff --git a/ksonnet-guestbook/components/params.libsonnet b/ksonnet-guestbook/components/params.libsonnet deleted file mode 100644 index 162ad1f..0000000 --- a/ksonnet-guestbook/components/params.libsonnet +++ /dev/null @@ -1,18 +0,0 @@ -{ - global: { - // User-defined global parameters; accessible to all component and environments, Ex: - // replicas: 4, - }, - components: { - // Component-level parameters, defined initially from 'ks prototype use ...' - // Each object below should correspond to a component in the components/ directory - "guestbook-ui": { - containerPort: 80, - image: "gcr.io/heptio-images/ks-guestbook-demo:0.2", - name: "ks-guestbook-ui", - replicas: 1, - servicePort: 80, - type: "LoadBalancer", - }, - }, -} diff --git a/ksonnet-guestbook/environments/base.libsonnet b/ksonnet-guestbook/environments/base.libsonnet deleted file mode 100644 index a129aff..0000000 --- a/ksonnet-guestbook/environments/base.libsonnet +++ /dev/null @@ -1,4 +0,0 @@ -local components = std.extVar("__ksonnet/components"); -components + { - // Insert user-specified overrides here. -} diff --git a/ksonnet-guestbook/environments/default/globals.libsonnet b/ksonnet-guestbook/environments/default/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/default/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/default/main.jsonnet b/ksonnet-guestbook/environments/default/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/default/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/default/params.libsonnet b/ksonnet-guestbook/environments/default/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/default/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -} diff --git a/ksonnet-guestbook/environments/dev/globals.libsonnet b/ksonnet-guestbook/environments/dev/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/dev/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/dev/main.jsonnet b/ksonnet-guestbook/environments/dev/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/dev/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/dev/params.libsonnet b/ksonnet-guestbook/environments/dev/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/dev/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -} diff --git a/ksonnet-guestbook/environments/prod/globals.libsonnet b/ksonnet-guestbook/environments/prod/globals.libsonnet deleted file mode 100644 index 7a73a41..0000000 --- a/ksonnet-guestbook/environments/prod/globals.libsonnet +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ksonnet-guestbook/environments/prod/main.jsonnet b/ksonnet-guestbook/environments/prod/main.jsonnet deleted file mode 100644 index 58695a8..0000000 --- a/ksonnet-guestbook/environments/prod/main.jsonnet +++ /dev/null @@ -1,8 +0,0 @@ -local base = import "base.libsonnet"; -// uncomment if you reference ksonnet-lib -// local k = import "k.libsonnet"; - -base + { - // Insert user-specified overrides here. For example if a component is named \"nginx-deployment\", you might have something like:\n") - // "nginx-deployment"+: k.deployment.mixin.metadata.labels({foo: "bar"}) -} diff --git a/ksonnet-guestbook/environments/prod/params.libsonnet b/ksonnet-guestbook/environments/prod/params.libsonnet deleted file mode 100644 index b6eb32d..0000000 --- a/ksonnet-guestbook/environments/prod/params.libsonnet +++ /dev/null @@ -1,17 +0,0 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - // Insert component parameter overrides here. Ex: - // guestbook +: { - // name: "guestbook-dev", - // replicas: params.global.replicas, - // }, - }, -}; - -{ - components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) - }, -}