Skip to content

Commit e6df886

Browse files
Duologicsparkprime
authored andcommitted
docs: update various links
1 parent 914f636 commit e6df886

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

doc/articles/kubernetes.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,29 @@ <h2 id="integrating">Using Jsonnet With Kubernetes</h2>
6363
example</a> from the Jsonnet repo.
6464
</li>
6565
<li>
66-
<a href="https://github.com/bitnami/kubecfg">Kubecfg</a> (whose name may sound familiar to
66+
<a href="https://github.com/kubecfg/kubecfg">Kubecfg</a> (whose name may sound familiar to
6767
current or ex-Googlers) is an unopiniated tool for evaluating Jsonnet and
6868
pushing the results to Kubernetes. It comes with a <a
6969
href="https://github.com/bitnami-labs/kube-libsonnet">useful template library</a>. See
7070
this <a href="https://engineering.bitnami.com/articles/an-example-of-real-kubernetes-bitnami.html">blog post</a>.
7171
</li>
7272
<li>
73-
<a href="https://ksonnet.io">Ksonnet</a>, by <a href="https://heptio.com">Heptio</a> is a
74-
fork of kubecfg which uses a Jsonnet library that is automatically generated from
75-
Kubernetes API specifications. This forms a framework in which Kubernetes objects can be
76-
built using high-level composable descriptions.
73+
<a href="https://tanka.dev">Tanka</a>, by <a href="https://grafana.com">Grafana Labs</a>
74+
is the spiritual successor of Ksonnet. It extends jsonnet with native functions
75+
to import Kustomize manifests and Helm charts, making it an allround tool to
76+
work with Kubernetes.
77+
</li>
78+
<li>
79+
<a href="https://https://github.com/jsonnet-libs/k8s">jsonnet-libs/k8s</a>
80+
generator produces over 30 Jsonnet Kubernetes libraries and counting, with most
81+
notably the <a href="https://jsonnet-libs.github.io/k8s-libsonnet/">k8s-libsonnet</a> library
82+
as the succesor of ksonnet-lib.
7783
</li>
7884
<li>
7985
<a href="https://github.com/deepmind/kapitan">Kapitan</a> by <a
8086
href="https://deepmind.com">Deepmind</a> is another tool for driving Kubernetes with
8187
Jsonnet and textual templating.
8288
</li>
83-
<li>
84-
<a href="https://github.com/coreos/kpm">Kpm</a> is a similar deployment tool (now
85-
deprecated) by <a href="https://coreos.com">CoreOS</a> that uses a mixture of Jsonnet and
86-
Jinja templating.
87-
</li>
8889
<li>
8990
<a href="https://www.box.com">Box</a> have <a
9091
href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">blogged</a>

doc/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,7 @@
303303
<img class=user-logo src=img/users/daydream-logo.png></a>
304304
-->
305305
<a href='https://deepmind.com'><img class=user-logo src=img/users/deepmind.png></a>
306-
<!--
307306
<a href='https://grafana.com'><img class=user-logo src=img/users/grafana.svg></a>
308-
-->
309-
<a href='https://www.heptio.com'><img class=user-logo src=img/users/heptio.jpg></a>
310-
<a href='https://kausal.co'><img class=user-logo src=img/users/kausal.svg></a>
311307
<!--
312308
<a href='https://www.spinnaker.io'><img class=user-logo src=img/users/spinnaker.png></a>
313309
-->

doc/learning/tools.html

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,20 @@ <h1 id="tooling">Tooling</h1>
2727
Editor integration for syntax highlighting and other features
2828
<ul>
2929
<li>
30-
<a href="https://heptio.com">Heptio</a> maintain a <a
31-
href="https://github.com/heptio/vscode-jsonnet">vscode</a> extension with quite
32-
sophisticated program analysis
33-
</li>
30+
<a href="https://github.com/grafana/jsonnet-language-server">Language
31+
Server Protocol (LSP) server</a>
32+
(maintained by <a href="https://grafana.com">Grafana Labs</a>)
33+
</li>
34+
<li>
35+
<a href="https://github.com/grafana/vscode-jsonnet">vscode</a>
36+
(maintained by <a href="https://grafana.com">Grafana Labs</a>)
37+
</li>
3438
<li>
3539
<a href="https://github.com/google/vim-jsonnet">Vim</a>
3640
</li>
3741
<li>
38-
<a href="https://github.com/google/codemirror-mode-jsonnet">Codemirror,</a> the editor
39-
widget used by this website
42+
<a href="https://github.com/google/codemirror-mode-jsonnet">Codemirror,</a>
43+
the editor widget used by this website
4044
</li>
4145
<li>
4246
<a href="https://github.com/google/language-jsonnet">Atom</a>
@@ -46,11 +50,16 @@ <h1 id="tooling">Tooling</h1>
4650
</li>
4751
<li>
4852
<a href="https://databricks.com/">Databricks</a> maintain an <a
49-
href="https://github.com/databricks/intellij-jsonnet">IntelliJ</a> plugin with jump to
50-
imported files and local variables.
53+
href="https://github.com/databricks/intellij-jsonnet">IntelliJ</a>
54+
plugin with jump to imported files and local variables
55+
</li>
56+
<li>
57+
Another <a href="https://github.com/zzehring/intellij-jsonnet">Intellij</a>
58+
with support for Grafana's LSP server
5159
</li>
5260
<li>
53-
An <a href="https://github.com/tminor/jsonnet-mode">Emacs mode</a> is also available.
61+
An <a href="https://github.com/tminor/jsonnet-mode">Emacs mode</a> is also
62+
available
5463
</li>
5564
</ul>
5665
</li>

0 commit comments

Comments
 (0)