Commit Graph

105 Commits

Author SHA1 Message Date
Gabriel Gonzalez
d4272b6b43 Fix CI to check that generation script has run
… based on the discussion in #138

CI wasn't checking that the `./scripts/generate.sh` script had been
run, which this change fixes
2020-09-10 19:22:25 -07:00
Gabriel Gonzalez
ad3369f9f9
Fix PersistentVolumeClaim (#144)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/136
2020-09-07 21:30:28 -07:00
Gabriel Gonzalez
59132b47b7
Fix examples to use remote imports (#142)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/140
2020-08-28 07:44:06 -07:00
Gabriel Gonzalez
c0586bcce5
Switch to dhall-openapi project (#137)
The `dhall-openapi` subproject from the `dhall-haskell` repository
supersedes `dhall-kubernetes-generator`, so this change switches over
to using that project.
2020-08-11 08:55:13 -07:00
Gabriel Gonzalez
f4bf4b9ddf
Only build README and examples for the preferred version (#132)
Also generate version 1.18 along the way

Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/131
2020-07-23 19:19:21 -07:00
Gabriel Gonzalez
a6a361875f
Disable Dhall's test suite (#130)
... so that the build works for Nix systems that are sandboxed

Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/128
2020-07-17 07:33:02 -07:00
Gabriel Gonzalez
170c6e86fc
Fix top-level examples (#129) 2020-07-14 07:51:57 -07:00
Tristan de Cacqueray
49fabcc9a1
Update to latest dhall to escape reserved keywords (#127)
This change updates the dhall-kubernetes-generator to use the latest dhall
version so that attribute named after reserved keywords are properly escape.
See: https://github.com/dhall-lang/dhall-haskell/issues/1896
2020-06-30 13:02:32 -07:00
Gabriel Gonzalez
fd9cdd4647
Support V1 CRD API (#123)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/122
2020-05-30 14:55:05 -07:00
Gabriel Gonzalez
98a4e61e1c
Fix evaluation failure in CI (#121)
Hydra complains about the branch name with:

```
hydra-eval-jobs returned exit code 1:
error: worker error: invalid Git branch/tag name 'refs/heads/nixos-unstable'
```

... and the branch name is not necessary anyway
2020-05-26 09:08:02 -07:00
Gabriel Gonzalez
b4908eb261
Remove --omit-empty from Nix code (#119)
It's no longer necessary, although in this case it happens to
have no effect
2020-05-09 07:39:01 -07:00
Gabriel Gonzalez
4a34acd613
Remove dead code (#118)
These scripts are obsolete and have been replaced by Nix code in
`./nix/nixpkgs.nix`
2020-05-08 09:04:45 -07:00
Gabriel Gonzalez
9badc02688
Improve error messages for CRD support (#117) 2020-05-08 09:02:12 -07:00
Gabriel Gonzalez
fc275e649b
Make ObjectMeta's name field optional (#115)
Supersedes https://github.com/dhall-lang/dhall-kubernetes/pull/85
2020-04-24 12:46:00 -07:00
Gabriel Gonzalez
506d633e38
Prefer autoscaler/v2beta2 (#113)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/112
2020-02-28 09:02:14 -08:00
Gabriel Gonzalez
381306bcc3
Go back to using --omitNull instead of --omitEmpty (#110)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/86

The motivation of this is to more accurately model the Kubernetes
API semantics by not auto-omitting empty fields.  This is because
a field set to `Some ([] : List T)` is not necessarily the same
as `None (List T)`.

This makes the typical case a bit more verbose (more `Some`s), but
the difference to the `./examples` shows that it's not too bad.
2020-01-31 06:52:20 -08:00
Gabriel Gonzalez
3e160f4a27
Upgrade to dhall-1.29.0 (#109)
The main motivation for the upgrade is to take advantage of the
improved formatting for example code
2020-01-30 07:23:13 -08:00
Alessandro Marrella
3c6d09a940
Update omit-empty command in Readme (#107) 2020-01-17 17:04:34 +00:00
Gabriel Gonzalez
6a47bd50c4
Remove top-level swagger2.json (#106)
We don't use this for generating the Kubernetes bindings any longer, so we
can safely remove it in order to avoid confusion
2020-01-15 12:59:00 -08:00
Gabriel Gonzalez
90c1eb8851
Minimize unnecessary rebuilds (#105)
This improves the granularity of the Nix build graph in order to minimize
unnecessary rebuilds.

This also fixed several bugs in the package generation along the way, so
this change includes those fixes.
2020-01-14 07:35:36 -08:00
Gabriel Gonzalez
a8ffffc4cb
Generate Dhall schemas for multiple Kubernetes versions (#104)
Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/75

This also changes the default version to the latest version to 1.17 since now
users can access older versions
2020-01-12 15:00:56 -08:00
Gabriel Gonzalez
eb001e6683
Groundwork for supporting multiple releases (#103)
Related to https://github.com/dhall-lang/dhall-kubernetes/issues/75

This generalizes the machinery for fetching the Kubernetes OpenAPI spec to
support fetching multiple versions.  In particular, the Kubernetes version
is no longer tied to the version of Nixpkgs that we use.
2020-01-10 21:40:36 -08:00
Gabriel Gonzalez
50dac0e944
Add nix-shell support for dhall-kubernetes-generator (#102) 2020-01-10 18:24:00 -08:00
Alessandro Marrella
8234563d02 Implement generator from CustomResourceDefinition (#98) 2020-01-10 06:22:41 -08:00
Gabriel Gonzalez
ddc42e6109
Change algorithm for prioritizing duplicate resources (#101)
Now we place a higher priority on production/beta/alpha than we do on v2/v1

... as requested by @amarrella
2020-01-08 07:52:07 -08:00
Gabriel Gonzalez
1c6397ccde
Improve coverage for ./scripts/generate.sh (#100)
`./scripts/generate.sh` will now also auto-update the
`./examples/*.dhall` files and `./package.dhall`, too
2020-01-07 18:29:56 -08:00
Gabriel Gonzalez
89e7c8ed0b
Automate exclusion of duplicate resources (#99)
Related to https://github.com/dhall-lang/dhall-kubernetes/issues/75

In order to support multiple versions of the Kubernetes API we need to begin
automating the process of excluding duplicate resources (otherwise the
maintenance burden would be far too high).  This change adds new support
for automatically preferring Kubernetes resources by version where:

* v2 is prioritized over v1
* production is prioritized over beta, which is prioritized over alpha

Note that even when prioritizing by version there are still a few cases of
duplicates.  For now we use the default behavior of `Data.List.maximumBy`
to select the last resource if there are still conflicts.  This leads to
a few differences in which resources are preferred when such a conflict
arises (where previously we were just guessing manually which one to pick).
2020-01-03 08:51:05 -08:00
Greg Ziegan
4ab28225a1 Update Kubernetes API and expose TypesUnion in package.dhall 2019-12-14 08:10:02 -08:00
Hunter Kelly
337a81fa8b Generator Improvements (#92)
* Add --skipDuplicates CLI flag and handler

* Add prefixMap option for specifying external import roots
2019-12-11 05:41:24 -08:00
Ari Becker
bbfec3d854 Add package.dhall (#95)
* Add a `package.dhall` file, which re-exports `schemas.dhall` and adds
`IntOrString`. The expected hash of `package.dhall` is currently:
sha256:3ea8628b704704de295261dfc7626c15247c589c10a266f970cade262543fdda

* Update documentation and examples to clarify that expected usage is
through the `package.dhall` file.

* README.md cleanup: Update tutorial reference URL to the latest `1.28`
release of `dhall-haskell`, and change code language hints from
`haskell` to `dhall`.
2019-12-07 13:41:54 -08:00
Greg Ziegan
7af2ab5345 Prefer "schema" syntax for examples (#93)
* Also update to the latest version of `dhall`
* Also fix `./scripts/generate.sh` to generate the `schemas*` files
2019-11-23 16:53:03 -08:00
Gabriel Gonzalez
fee24c0993
Add dhall-kubernetes support for "schemas" (#84)
For lack of a better term, I'm calling the `{ Type = …, default = … }`
record that the record completion operator expects a "schema".  This
change adds `dhall-kubernetes` support for auto-generating these schemas
for ease of use with the new `::` operator.

See the included example for how this would be used
2019-11-18 08:22:19 -08:00
James Guthrie
2fb32a453c Set Cron* types and defaults to v1beta1 (#88)
According to the Kubernetes documentation [1]:

Note: CronJob resource in batch/v2alpha1 API group has been deprecated
starting from cluster version 1.8. You should switch to using
batch/v1beta1, instead, which is enabled by default in the API server.
Examples in this document use batch/v1beta1 in all examples.

[1]: https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/
2019-11-16 18:18:44 -08:00
Alessandro Marrella
14ef113368 Add EarnestResearch/dhall-packages to the users (#89)
We are happy users of dhall and dhall-kubernetes and we opensourced our bindings, I'm proposing to add them here for better discovery :)
2019-11-16 18:06:58 -08:00
Simon Jakobi
dea2c92017
Update Prelude.dhall to v10.0.0 (#80)
Now all the examples will build again with current versions
of dhall.
2019-09-16 18:52:23 +02:00
Fabrizio Ferrai
4ad58156b7
Update to Kubernetes 1.14.3 (#72) 2019-07-30 10:25:00 +03:00
Alessandro Marrella
f3d759009f Modify Kubernetes generator to support more cases (#69)
* Adjust dhall-kubernetes-generator to handle different swagger specs
2019-07-12 11:49:49 +03:00
Andrew DeMaria
fef6b2328b Show kind for error message (#66)
In the case that an older kubernetes openapi is used, some of the
excluded models for newer versions will cause a necessary object for the
older kubernetes version to be filtered. In this case, showing the Kind
is helpful for debugging.
2019-06-10 08:06:30 +03:00
Fabrizio Ferrai
8afa82f0c7
Switch to native GitHub highlighting 2019-06-07 15:16:43 +03:00
Fabrizio Ferrai
fad3589782
Update to latest Dhall version (#65) 2019-05-13 18:05:56 +03:00
Robbie McMichael
d2edbe2104 Set syntax highlighting for Dhall files (#63) 2019-05-07 18:10:26 +03:00
Fabrizio Ferrai
16a4eabbd5
Add link to stack website (#61) 2019-05-02 10:29:02 +03:00
Fabrizio Ferrai
805b432df2
API v2 (#57)
This ports the conversion script from Python to Haskell (fix #7)

The main reasons for this port are that:
- the Python script was really hard to maintain for reasons like 
  "converting from Swagger to Dhall is interleaved with string formatting"
- in Haskell we can use the dhall library to generate always syntactically 
  correct Dhall AST. It's also much easier to keep an eye on correctness, 
  because types and pattern matching. It also forces us to deal with things
  like cyclic imports from the get go.

Things happening here:
- remove the `api` folder, removing the difference between "raw api" and "nice api"
- move defaults from `default` to `defaults` folder, as it is in `dhall-nethack`
- transition to the new syntax for `Optional` (fix #49)
- add `types.dhall` and `defaults.dhall`, so that one can now easily "pin a version"
  by just importing these two records at a specific commit/tag. They also make it really
  easy to access objects, e.g.
  `let types = https://raw.githubusercontent... sha256:... in types.Deployment`
- also add typesUnion.dhall (fix #54), so one is able to send to Kubernetes different
  objects in the same stream. This is also documented in the README
- defaults are resolved recursively (fix #46): if there's an import of a "nullable" record,
  then it's not marked as Optional, making merging objects much easier
- default objects are not lambdas anymore, and instead they just don't include the required
  fields (that is, the ones that are not nullable records), as suggested in dhall-lang/dhall-lang#382
- for objects that are simple types we used to generate a simple lambda
  `\(a : Text) -> a` as a default, now we just don't generate a default (e.g. see
  `io.k8s.apimachinery.pkg.apis.meta.v1.Time`)
- autoformat all generated Dhall code
- remove cyclic imports (fix #47)
- update to dhall-1.22 and dhall-json-1.2.8
2019-05-01 19:13:18 +03:00
James Griffiths
5d11c98b86 Update Dhall version in readme (#60) 2019-04-18 09:56:33 +03:00
Fabrizio Ferrai
69c85131d1 Add logo to README (#59) 2019-04-02 11:53:33 +02:00
Arian van Putten
a670cd1fee
Add logo (#58) 2019-03-31 15:24:48 +02:00
Arian van Putten
8d295ecedc
Nixify the build (#55)
This makes our build reproducible and consistent

* Disables dhall tests. They don't build in sandbox mode because they require network access
* Moves all scripts to ./scripts folder for consistency
* Moves all nix files to ./nix folder for consistency, except for release.nix which Hydra needs
* Changes convert.py to take the K8s swagger spec as an argument
* Get k8s swagger spec from nixpkgs
* Get dhall prelude from nixpkgs
* added an ./scripts/update-nixpkgs.sh script to easily update to a new version of nixpkgs
2019-03-30 11:05:29 +01:00
Fabrizio Ferrai
f860c4e2a4
Upgrade to Kubernetes 0.13.4 (#53) 2019-03-25 12:32:48 +02:00
Fabrizio Ferrai
423db8a8bb
Centralize Prelude import (#51)
Import the Prelude only in one place, so it's cached and easily overridable
2019-03-25 12:20:27 +02:00
Ari Becker
047e56a442 Add "Projects Using" section to the docs, with dhall-prometheus-operator (#52) 2019-03-25 11:15:20 +02:00