Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/md/tutorial/_hello-holos/examples/01-holos-version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
2 changes: 1 addition & 1 deletion doc/md/tutorial/_helm-values/examples/01-holos-version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main 70107f8] add blackbox configuration
[main 11e8f96] add blackbox configuration
1 file changed, 15 insertions(+)
create mode 100644 config/prometheus/blackbox.cue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main dc787e2] integrate blackbox and prometheus together
[main 1ea1005] integrate blackbox and prometheus together
3 files changed, 1348 insertions(+), 2 deletions(-)
create mode 100644 components/prometheus/values.cue.orig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main aaf64bb] import values
[main a2e337a] import values
2 files changed, 1815 insertions(+)
create mode 100644 components/blackbox/values.cue
create mode 100644 components/prometheus/values.cue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rendered blackbox in 111.222667ms
rendered prometheus in 139.292917ms
rendered platform in 139.350708ms
rendered blackbox in 143.36875ms
rendered prometheus in 170.982208ms
rendered platform in 171.067125ms
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main 688da56] add blackbox and prometheus
[main 58e925d] add blackbox and prometheus
5 files changed, 1550 insertions(+)
create mode 100644 components/blackbox/blackbox.cue
create mode 100644 components/prometheus/prometheus.cue
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rendered blackbox in 778.713375ms
rendered prometheus in 839.024292ms
rendered platform in 839.07325ms
rendered blackbox in 5.63152525s
rendered prometheus in 9.53072125s
rendered platform in 9.530793625s
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[main 2d46297] render integrated blackbox and prometheus manifests
[main f4371e4] render integrated blackbox and prometheus manifests
2 files changed, 7 insertions(+), 7 deletions(-)
2 changes: 1 addition & 1 deletion doc/md/tutorial/_kustomize/examples/01-holos-version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main f621828] add httpbin
[main da03e4a] add httpbin
4 files changed, 113 insertions(+)
create mode 100644 components/httpbin/httpbin.cue
create mode 100644 components/httpbin/httpbin.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main 0cccd8c] annotate httpbin for prometheus probes
[main 2d3c3cb] annotate httpbin for prometheus probes
2 files changed, 18 insertions(+)
create mode 100644 components/httpbin/patches.cue
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rendered httpbin in 77.754459ms
rendered platform in 77.832042ms
rendered httpbin in 99.597583ms
rendered platform in 99.678042ms
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rendered httpbin in 77.095625ms
rendered platform in 77.190416ms
rendered httpbin in 2.595108833s
rendered platform in 2.595221s
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rendered podinfo in 159.277916ms
rendered platform in 159.380625ms
rendered podinfo in 4.155374125s
rendered platform in 4.155477334s
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main 7761ac1] add blackbox configuration
[main d448299] add blackbox configuration
1 file changed, 15 insertions(+)
create mode 100644 config/prometheus/blackbox.cue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main 8c81fed] integrate blackbox and prometheus together
[main 2ce5a78] integrate blackbox and prometheus together
3 files changed, 1348 insertions(+), 2 deletions(-)
create mode 100644 components/prometheus/values.cue.orig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main 18c7aad] import values
[main 2f0cd50] import values
2 files changed, 1815 insertions(+)
create mode 100644 components/blackbox/values.cue
create mode 100644 components/prometheus/values.cue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rendered blackbox in 110.354458ms
rendered prometheus in 138.13225ms
rendered platform in 138.168958ms
rendered blackbox in 143.137333ms
rendered prometheus in 167.300583ms
rendered platform in 167.341209ms
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main ff5bfaa] add blackbox and prometheus
[main b7e507c] add blackbox and prometheus
5 files changed, 1550 insertions(+)
create mode 100644 components/blackbox/blackbox.cue
create mode 100644 components/prometheus/prometheus.cue
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rendered blackbox in 693.763959ms
rendered prometheus in 788.544209ms
rendered platform in 788.618792ms
rendered blackbox in 5.595935416s
rendered prometheus in 5.602449167s
rendered platform in 5.602527541s
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[main 4033953] render integrated blackbox and prometheus manifests
[main 137f66a] render integrated blackbox and prometheus manifests
2 files changed, 7 insertions(+), 7 deletions(-)
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cmp stdout $WORK/output.txt
-- command.sh --
holos --version
-- output.txt --
0.104.3
0.105.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[main 1b332f8] add httpbin
[main 2c843b8] add httpbin
4 files changed, 113 insertions(+)
create mode 100644 components/httpbin/httpbin.cue
create mode 100644 components/httpbin/httpbin.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[main e37f8ce] annotate httpbin for prometheus probes
[main a324ab5] annotate httpbin for prometheus probes
2 files changed, 18 insertions(+)
create mode 100644 components/httpbin/patches.cue
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rendered httpbin in 77.710709ms
rendered platform in 77.792958ms
rendered httpbin in 113.981791ms
rendered platform in 114.0585ms
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rendered httpbin in 76.942666ms
rendered platform in 77.014958ms
rendered httpbin in 2.546013s
rendered platform in 2.546090458s
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/holos-run/holos

go 1.23.0

toolchain go1.23.6
go 1.24.0

require (
cuelang.org/go v0.14.1
Expand Down Expand Up @@ -110,6 +108,7 @@ require (
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -129,6 +128,7 @@ require (
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/patrickdappollonio/kubectl-slice v1.4.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
Expand All @@ -153,7 +153,7 @@ require (
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/viper v1.18.2 // indirect
github.com/spf13/viper v1.19.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tetratelabs/wazero v1.9.0 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,8 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 h1:NK3O7S5FRD/wj7ORQ5C3Mx1STpyEMuFe+/F0Lakd1Nk=
github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4/go.mod h1:FqD3ES5hx6zpzDainDaHgkTIqrPaI9uX4CVWqYZoQjY=
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
Expand Down Expand Up @@ -364,6 +366,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
github.com/patrickdappollonio/kubectl-slice v1.4.2 h1:U1Jrma4BRK9D1Mbly8oP6uA06/gmOif6KjVQFrPUBzI=
github.com/patrickdappollonio/kubectl-slice v1.4.2/go.mod h1:gt3IidcTPeCcazqcMuXF51VWU5mGsQv6YlNpXxQvPsE=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand Down Expand Up @@ -444,6 +448,8 @@ github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
Expand Down
4 changes: 4 additions & 0 deletions internal/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

"github.com/holos-run/holos/internal/cli/command"
"github.com/holos-run/holos/internal/cli/render"
"github.com/holos-run/holos/internal/cli/slice"
"github.com/holos-run/holos/internal/cli/txtar"

cueCmd "cuelang.org/go/cmd/cue/cmd"
Expand Down Expand Up @@ -82,6 +83,9 @@ func New(cfg *holos.Config) *cobra.Command {
// Compile
rootCmd.AddCommand(NewCompileCmd())

// Slice - https://github.com/patrickdappollonio/kubectl-slice
rootCmd.AddCommand(slice.NewKubectlSliceCmd())

return rootCmd
}

Expand Down
22 changes: 22 additions & 0 deletions internal/cli/slice/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// MIT License

// Copyright (c) 2021 Patrick D'appollonio

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
package slice
Loading