Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Commit eab33d4

Browse files
ibuildthecloudibuildthecloud
authored
Merge pull request #1582 from ibuildthecloud/main
Initial work for hub on hub feature set
2 parents 696e7f5 + e90ef98 commit eab33d4

File tree

63 files changed

+627
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+627
-118
lines changed

‎.goreleaser.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ builds:
2323
goarch: arm
2424
tags:
2525
- netgo
26+
flags:
27+
- -trimpath
2628
ldflags:
2729
- -s
2830
- -w

‎docs/docs/100-reference/01-command-line/acorn_image.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ acorn images
4040
### SEE ALSO
4141

4242
* [acorn](acorn.md) -
43-
* [acorn image detail](acorn_image_detail.md) - Show details of an Image
43+
* [acorn image details](acorn_image_details.md) - Show details of an Image
4444
* [acorn image rm](acorn_image_rm.md) - Delete an Image
4545

‎docs/docs/100-reference/01-command-line/acorn_image_detail.md‎ renamed to ‎docs/docs/100-reference/01-command-line/acorn_image_details.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
title: "acorn image detail"
2+
title: "acorn image details"
33
---
4-
## acorn image detail
4+
## acorn image details
55

66
Show details of an Image
77

88
```
9-
acorn image detail IMAGE_NAME [NESTED DIGEST] [flags]
9+
acorn image details IMAGE_NAME [NESTED DIGEST] [flags]
1010
```
1111

1212
### Examples
1313

1414
```
15-
acorn image detail my-image
15+
acorn image details my-image
1616
```
1717

1818
### Options
1919

2020
```
21-
-h, --help help for detail
21+
-h, --help help for details
2222
-o, --output string Output format (json, yaml, aml) (default "aml")
2323
```
2424

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ replace (
1717
require (
1818
cuelang.org/go v0.4.3
1919
github.com/AlecAivazis/survey/v2 v2.3.6
20-
github.com/acorn-io/aml v0.0.0-20230428030628-bf98aa39a36a
20+
github.com/acorn-io/aml v0.0.0-20230508165239-a955bf7c0ca8
2121
github.com/acorn-io/baaah v0.0.0-20230428031609-d553bca0d3d8
2222
github.com/acorn-io/mink v0.0.0-20230424190003-9a32355ec823
2323
github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ github.com/ThalesIgnite/crypto11 v1.2.5/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR
156156
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
157157
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
158158
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
159-
github.com/acorn-io/aml v0.0.0-20230428030628-bf98aa39a36a h1:yI6MDJU3pcbieiqvNCbqDzu8getkxfwc799NMQrsi58=
160-
github.com/acorn-io/aml v0.0.0-20230428030628-bf98aa39a36a/go.mod h1:UEx5RRLFjryCEHN2pM59+d8A0mPJ3VAxggJOTzPymwg=
159+
github.com/acorn-io/aml v0.0.0-20230508165239-a955bf7c0ca8 h1:DELIu5TY36vGxp2rvuPzJrEQrCgNUwA3aJihUgns0Sw=
160+
github.com/acorn-io/aml v0.0.0-20230508165239-a955bf7c0ca8/go.mod h1:UEx5RRLFjryCEHN2pM59+d8A0mPJ3VAxggJOTzPymwg=
161161
github.com/acorn-io/apiserver v0.25.2-ot-2 h1:drxKtiHh2dGnKlhVYxgPCKkFXRvMFxdflCZ5fHpVp8E=
162162
github.com/acorn-io/apiserver v0.25.2-ot-2/go.mod h1:qRxmYneSxb8B1FYvgQf6mPeWuwugIzYKN3TeMmL4FVo=
163163
github.com/acorn-io/baaah v0.0.0-20230428031609-d553bca0d3d8 h1:8DA+z4B0aC+u4x1H+3vlgQHytVlyxlkNdS1aMYE/Y+A=

‎pkg/apis/api.acorn.io/v1/types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ type ImageDetails struct {
203203
NestedDigest string `json:"nestedDigest,omitempty"`
204204
DeployArgs v1.GenericMap `json:"deployArgs,omitempty"`
205205
Profiles []string `json:"profiles,omitempty"`
206+
Auth *RegistryAuth `json:"auth,omitempty"`
206207

207208
// Output Params
208209
AppImage v1.AppImage `json:"appImage,omitempty"`

‎pkg/apis/api.acorn.io/v1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/internal.acorn.io/v1/appinstance.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ type AppInstanceCondition string
1111

1212
var (
1313
AppInstanceConditionDefined = "defined"
14+
AppInstanceConditionDependencies = "dependencies"
1415
AppInstanceConditionDefaults = "defaults"
1516
AppInstanceConditionScheduling = "scheduling"
1617
AppInstanceConditionNamespace = "namespace"
1718
AppInstanceConditionParsed = "parsed"
1819
AppInstanceConditionController = "controller"
1920
AppInstanceConditionPulled = "image-pull"
2021
AppInstanceConditionSecrets = "secrets"
22+
AppInstanceConditionServices = "services"
2123
AppInstanceConditionContainers = "containers"
2224
AppInstanceConditionJobs = "jobs"
2325
AppInstanceConditionAcorns = "acorns"

‎pkg/apis/internal.acorn.io/v1/appspec.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ type Acorn struct {
423423
Profiles []string `json:"profiles,omitempty"`
424424
DeployArgs GenericMap `json:"deployArgs,omitempty"`
425425
Publish PortBindings `json:"publish,omitempty"`
426+
PublishMode PublishMode `json:"publishMode,omitempty"`
426427
Environment NameValues `json:"environment,omitempty"`
427428
Secrets SecretBindings `json:"secrets,omitempty"`
428429
Volumes VolumeBindings `json:"volumes,omitempty"`
@@ -436,6 +437,7 @@ type Acorn struct {
436437

437438
type Secret struct {
438439
External string `json:"external,omitempty"`
440+
Alias string `json:"alias,omitempty"`
439441
Labels map[string]string `json:"labels,omitempty"`
440442
Annotations map[string]string `json:"annotations,omitempty"`
441443
Type string `json:"type,omitempty"`
@@ -468,6 +470,7 @@ type Service struct {
468470
Annotations ScopedLabels `json:"annotations,omitempty"`
469471
Default bool `json:"default,omitempty"`
470472
External string `json:"external,omitempty"`
473+
Alias string `json:"alias,omitempty"`
471474
Address string `json:"address,omitempty"`
472475
Ports Ports `json:"ports,omitempty"`
473476
Container string `json:"container,omitempty"`

‎pkg/apis/internal.acorn.io/v1/service.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type ServiceInstanceSpec struct {
4343
Annotations map[string]string `json:"annotations,omitempty"`
4444
Default bool `json:"default"`
4545
External string `json:"external,omitempty"`
46+
Alias string `json:"alias,omitempty"`
4647
Address string `json:"address,omitempty"`
4748
Ports Ports `json:"ports,omitempty"`
4849
Container string `json:"container,omitempty"`

0 commit comments

Comments
 (0)