-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
21 changed files
with
684 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,3 +74,4 @@ Network Trash Folder | |
| Temporary Items | ||
| .apdisk | ||
|
|
||
| corral | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package cmd_package | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| _package "github.com/rancherlabs/corral/pkg/package" | ||
| "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| const templateDescription = ` | ||
| Create a package from existing package(s). | ||
| Examples: | ||
| corral package template a b c OUT | ||
| corral package template -f config.yaml | ||
| ` | ||
|
|
||
| func NewCommandTemplate() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "template", | ||
| Short: "Create a package from a template", | ||
| Long: templateDescription, | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| err := template(cmd, args) | ||
| if err != nil { | ||
| logrus.Fatalf("Error rendering package template: %v", err) | ||
| } | ||
| }, | ||
| Args: cobra.MinimumNArgs(1), | ||
| } | ||
|
|
||
| cmd.Flags().StringP("file", "f", "", "yaml file to define template values") | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // embed a template | ||
| func template(cmd *cobra.Command, args []string) error { | ||
| file, err := cmd.Flags().GetString("file") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| body, err := os.ReadFile(file) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var t _package.TemplateSpec | ||
|
|
||
| if err = yaml.Unmarshal(body, &t); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| srcs := append(t.Packages, args[:len(args)-1]...) | ||
| pkgs := make([]_package.Package, len(srcs)) | ||
|
|
||
| for i, p := range srcs { | ||
| pkg, err := _package.LoadPackage(p) // ensures pkg is in cache | ||
| if err != nil { | ||
| return err | ||
| } | ||
| pkgs[i] = pkg | ||
| } | ||
|
|
||
| name := args[len(args)-1] | ||
|
|
||
| manifest, err := _package.MergePackages(name, pkgs) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| manifest.Description = t.Description | ||
|
|
||
| buf, err := yaml.Marshal(manifest) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = _package.ValidateManifest(buf) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = os.WriteFile(filepath.Join(name, "manifest.yaml"), buf, 0664) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| name: template | ||
| description: > | ||
| A simple template example. | ||
| This package was generated with the following command: | ||
| `corral package template -f config.yaml test simple-test` | ||
| packages: | ||
| - ../simple |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: simple-test | ||
| description: | | ||
| A simple template example. This package was generated with the following command: `corral package template -f config.yaml simple-test` | ||
| commands: | ||
| - module: simple/module | ||
| - command: /app/setvar1.sh | ||
| node_pools: | ||
| - all | ||
| - command: ls /app | ||
| node_pools: | ||
| - all | ||
| - command: /app/setvar2.sh | ||
| node_pools: | ||
| - all | ||
| variables: | ||
| var1: | ||
| default: foo | ||
| description: Example variable for testing variable flows. | ||
| type: string | ||
| var1_out: | ||
| description: Set to the value of var1 by a corral set script. | ||
| readOnly: true | ||
| type: string | ||
| var2_out: | ||
| description: Set to the value of var1_out by a corral set script. | ||
| readOnly: true | ||
| type: string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/sh | ||
|
|
||
| env | ||
|
|
||
| echo "corral_set var1_out=${CORRAL_var1}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/sh | ||
|
|
||
| env | ||
|
|
||
| echo "corral_set var2_out=${CORRAL_var1_out}" |
14 changes: 14 additions & 0 deletions
14
examples/template/simple-test/terraform/simple/module/corral.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| variable "corral_name" {} | ||
| variable "corral_public_key" {} | ||
|
|
||
| output "corral_node_pools" { | ||
| value = { | ||
| all = [ | ||
| for n in docker_container.node : { | ||
| name = n.name | ||
| user = "corral" | ||
| address = "127.0.0.1:${n.ports[0].external}" | ||
| } | ||
| ] | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
examples/template/simple-test/terraform/simple/module/main.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| terraform { | ||
| required_providers { | ||
| docker = { | ||
| source = "kreuzwerker/docker" | ||
| version = "~> 2.13.0" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| provider "docker" {} | ||
|
|
||
| resource "docker_volume" "data" { | ||
| count = 1 | ||
| name = "${var.corral_name}-node-${count.index}" | ||
| } | ||
|
|
||
| resource "docker_container" "node" { | ||
| count = 1 | ||
| image = "lscr.io/linuxserver/openssh-server" | ||
| name = "${var.corral_name}-node-${count.index}" | ||
|
|
||
| ports { | ||
| internal = 2222 | ||
| } | ||
|
|
||
| env = [ | ||
| "PUBLIC_KEY=${var.corral_public_key}", | ||
| "USER_NAME=corral", | ||
| "USER_PASSWORD=corral", | ||
| "SUDO_ACCESS=true", | ||
| "PASSWORD_ACCESS=true", | ||
| ] | ||
|
|
||
| volumes { | ||
| container_path = "/app" | ||
| volume_name = docker_volume.data[count.index].name | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| name: test | ||
| description: > | ||
| A simple package for developing corral. | ||
| commands: | ||
| - command: /app/setvar2.sh | ||
| node_pools: | ||
| - all | ||
| variables: | ||
| var1_out: | ||
| type: string | ||
| readOnly: true | ||
| description: "Set to the value of var1 by a corral set script." | ||
| var2_out: | ||
| type: string | ||
| readOnly: true | ||
| description: "Set to the value of var1_out by a corral set script." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/sh | ||
|
|
||
| env | ||
|
|
||
| echo "corral_set var2_out=${CORRAL_var1_out}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.