From a8cabb837176003437c162fa46541d6a0ff97343 Mon Sep 17 00:00:00 2001 From: Christian Busch Date: Tue, 25 Oct 2022 11:11:41 +0200 Subject: [PATCH] refactor: move examples into separate folder --- deck.example.yaml | 91 ------------------- examples/deck.buzzword-counter.yaml | 63 +++++++++++++ .../deck.gefyra.yaml | 0 examples/deck.java-spring.yaml | 28 ++++++ .../deck.kind.yaml | 46 ++-------- 5 files changed, 100 insertions(+), 128 deletions(-) delete mode 100644 deck.example.yaml create mode 100644 examples/deck.buzzword-counter.yaml rename deck.gefyra.test.yaml => examples/deck.gefyra.yaml (100%) create mode 100644 examples/deck.java-spring.yaml rename deck.example_kind.yaml => examples/deck.kind.yaml (53%) diff --git a/deck.example.yaml b/deck.example.yaml deleted file mode 100644 index e0bc08e..0000000 --- a/deck.example.yaml +++ /dev/null @@ -1,91 +0,0 @@ -version: "1" - -# the cluster configuration across all decks -cluster: - provider: k3d - minVersion: 4.0.0 - name: another-cluster - nativeConfig: # content of the native config file (e.g. https://k3d.io/v5.0.0/usage/configfile/) - apiVersion: k3d.io/v1alpha2 - kind: Simple - servers: 1 # same as `--servers 1` - agents: 1 # same as `--agents 2` - image: rancher/k3s:v1.22.9-k3s1 # same as `--image rancher/k3s:v1.20.4-k3s1` - ports: - - port: 8080:80 - nodeFilters: - - loadbalancer - - port: 31820:31820/UDP - nodeFilters: - - agent[0] - -decks: - - name: buzzword-counter - namespace: default - sources: - - type: helm - ref: https://kubernetes.github.io/dashboard/ - chart: kubernetes-dashboard - releaseName: dashboard - parameters: - - name: ingress.enabled - value: true - - name: ingress.hosts - value: '{dashboard.127.0.0.1.nip.io}' - - name: protocolHttp - value: true - - name: service.externalPort - value: 8080 - - name: serviceAccount.create - value: true - - name: serviceAccount.name - value: kubernetes-dashboard -# - type: file -# ref: https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.0/aio/deploy/recommended.yaml - - - type: file - content: - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRoleBinding - metadata: - name: kubernetes-dashboard - namespace: kubernetes-dashboard - roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin - subjects: - - kind: ServiceAccount - name: kubernetes-dashboard - namespace: default - - - type: helm - ref: git@github.com:Blueshoe/buzzword-charts.git - targetRevision: HEAD # only relevant for git - path: buzzword-counter -# chart: chart-name # Set this when pulling directly from a Helm repo. DO NOT set for git-hosted Helm charts. - -# parameters: # extra values for --set (take precedence) -# - name: "ingress.domain" -# value: mydomain.example.com -# - name: "ingress.annotations.nginx-" -# value: "true" - - releaseName: buzzword-counter # Release name override (defaults to application name) - -# valueFiles: # Helm values (files) relative to 'path' -# - helm_vars/development/values.development.yaml -# - type: kustomize -# - type: directory -# ref: git@github.com:Blueshoe/buzzword-charts.git -# targetRevision: HEAD -# path: . -# recursive: true - - - name: polls - namespace: polls - sources: - - type: kustomize - ref: https://github.com/Blueshoe/java-spring-example-charts.git - targetRevision: main - path: polls_k/overlays/development \ No newline at end of file diff --git a/examples/deck.buzzword-counter.yaml b/examples/deck.buzzword-counter.yaml new file mode 100644 index 0000000..e32c7aa --- /dev/null +++ b/examples/deck.buzzword-counter.yaml @@ -0,0 +1,63 @@ +version: "1" + +cluster: + provider: k3d + minVersion: 4.0.0 + name: another-cluster + nativeConfig: + apiVersion: k3d.io/v1alpha2 + kind: Simple + servers: 1 + agents: 1 + image: rancher/k3s:v1.22.9-k3s1 + ports: + - port: 8080:80 + nodeFilters: + - loadbalancer + - port: 31820:31820/UDP + nodeFilters: + - agent[0] + +decks: + - name: buzzword-counter + namespace: default + sources: + - type: helm + ref: https://kubernetes.github.io/dashboard/ + chart: kubernetes-dashboard + releaseName: dashboard + parameters: + - name: ingress.enabled + value: true + - name: ingress.hosts + value: "{dashboard.127.0.0.1.nip.io}" + - name: protocolHttp + value: true + - name: service.externalPort + value: 8080 + - name: serviceAccount.create + value: true + - name: serviceAccount.name + value: kubernetes-dashboard + + - type: inline + content: + apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + metadata: + name: kubernetes-dashboard + namespace: kubernetes-dashboard + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin + subjects: + - kind: ServiceAccount + name: kubernetes-dashboard + namespace: default + + - type: helm + ref: git@github.com:Blueshoe/buzzword-charts.git + targetRevision: HEAD + path: buzzword-counter + releaseName: buzzword-counter diff --git a/deck.gefyra.test.yaml b/examples/deck.gefyra.yaml similarity index 100% rename from deck.gefyra.test.yaml rename to examples/deck.gefyra.yaml diff --git a/examples/deck.java-spring.yaml b/examples/deck.java-spring.yaml new file mode 100644 index 0000000..09a98e8 --- /dev/null +++ b/examples/deck.java-spring.yaml @@ -0,0 +1,28 @@ +version: "1" + +cluster: + provider: k3d + minVersion: 4.0.0 + name: another-cluster + nativeConfig: + apiVersion: k3d.io/v1alpha2 + kind: Simple + servers: 1 + agents: 1 + image: rancher/k3s:v1.22.9-k3s1 + ports: + - port: 8080:80 + nodeFilters: + - loadbalancer + - port: 31820:31820/UDP + nodeFilters: + - agent[0] + +decks: + - name: polls + namespace: polls + sources: + - type: kustomize + ref: https://github.com/Blueshoe/java-spring-example-charts.git + targetRevision: main + path: polls_k/overlays/development diff --git a/deck.example_kind.yaml b/examples/deck.kind.yaml similarity index 53% rename from deck.example_kind.yaml rename to examples/deck.kind.yaml index b565df0..cc48c0e 100644 --- a/deck.example_kind.yaml +++ b/examples/deck.kind.yaml @@ -1,21 +1,20 @@ version: "1" -# the cluster configuration across all decks cluster: provider: kind minVersion: 0.14.0 name: another-cluster - nativeConfig: # content of the native config file (e.g. https://kind.sigs.k8s.io/docs/user/configuration/) + nativeConfig: apiVersion: kind.x-k8s.io/v1alpha4 kind: Cluster nodes: - role: control-plane kubeadmConfigPatches: - - | - kind: InitConfiguration - nodeRegistration: - kubeletExtraArgs: - node-labels: "ingress-ready=true" + - | + kind: InitConfiguration + nodeRegistration: + kubeletExtraArgs: + node-labels: "ingress-ready=true" extraPortMappings: - containerPort: 80 hostPort: 8080 @@ -24,7 +23,6 @@ cluster: protocol: udp - role: worker - decks: - name: buzzword-counter namespace: default @@ -37,7 +35,7 @@ decks: - name: ingress.enabled value: true - name: ingress.hosts - value: '{dashboard.127.0.0.1.nip.io}' + value: "{dashboard.127.0.0.1.nip.io}" - name: protocolHttp value: true - name: service.externalPort @@ -46,10 +44,8 @@ decks: value: true - name: serviceAccount.name value: kubernetes-dashboard -# - type: file -# ref: https://raw.githubusercontent.com/kubernetes/dashboard/v2.5.0/aio/deploy/recommended.yaml - - type: file + - type: inline content: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -64,30 +60,6 @@ decks: - kind: ServiceAccount name: kubernetes-dashboard namespace: default + - type: file ref: https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml - - - -# - type: helm -# ref: git@github.com:Blueshoe/buzzword-charts.git -# targetRevision: HEAD # only relevant for git -# path: buzzword-counter -## chart: chart-name # Set this when pulling directly from a Helm repo. DO NOT set for git-hosted Helm charts. -# -## parameters: # extra values for --set (take precedence) -## - name: "ingress.domain" -## value: mydomain.example.com -## - name: "ingress.annotations.nginx-" -## value: "true" -# -# releaseName: buzzword-counter # Release name override (defaults to application name) - -# valueFiles: # Helm values (files) relative to 'path' -# - helm_vars/development/values.development.yaml -# - type: kustomize -# - type: directory -# ref: git@github.com:Blueshoe/buzzword-charts.git -# targetRevision: HEAD -# path: . -# recursive: true \ No newline at end of file