Skip to content

Commit

Permalink
Replace publishing rules for workshop files with vendir snippet.
Browse files Browse the repository at this point in the history
  • Loading branch information
@GrahamDumpleton
GrahamDumpleton committed Aug 4, 2023
1 parent 2a31531 commit 4c64882
Show file tree
Hide file tree
Showing 7 changed files with 245 additions and 109 deletions.
67 changes: 61 additions & 6 deletions carvel-packages/training-platform/bundle/config/11-session-manager/01-crds-workshop.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,69 @@ spec:
properties:
image:
type: string
includePaths:
type: array
items:
type: string
excludePaths:
files:
type: array
items:
type: string
type: object
oneOf:
- required:
- git
- required:
- hg
- required:
- http
- required:
- image
- required:
- imgpkgBundle
- required:
- githubRelease
- required:
- helmChart
- required:
- directory
properties:
path:
type: string
default: "."
git:
type: object
x-kubernetes-preserve-unknown-fields: true
hg:
type: object
x-kubernetes-preserve-unknown-fields: true
http:
type: object
x-kubernetes-preserve-unknown-fields: true
image:
type: object
x-kubernetes-preserve-unknown-fields: true
imgpkgBundle:
type: object
x-kubernetes-preserve-unknown-fields: true
githubRelease:
type: object
x-kubernetes-preserve-unknown-fields: true
helmChart:
type: object
x-kubernetes-preserve-unknown-fields: true
directory:
type: object
x-kubernetes-preserve-unknown-fields: true
includePaths:
type: array
items:
type: string
excludePaths:
type: array
items:
type: string
legalPaths:
type: array
items:
type: string
newRootPath:
type: string
workshop:
type: object
properties:
Expand Down
43 changes: 24 additions & 19 deletions client-programs/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ require (
github.com/compose-spec/compose-go v1.7.0
github.com/cppforlife/go-cli-ui v0.0.0-20220622150351-995494831c6c
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v20.10.25+incompatible
github.com/docker/docker v23.0.3+incompatible
github.com/docker/go-connections v0.4.0
github.com/gorilla/websocket v1.5.0
github.com/joho/godotenv v1.5.1
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.6.1
github.com/vmware-tanzu/carvel-imgpkg v0.33.0
github.com/spf13/cobra v1.7.0
github.com/vmware-tanzu/carvel-imgpkg v0.37.2
github.com/vmware-tanzu/carvel-kapp v0.53.0
golang.org/x/exp v0.0.0-20221111204811-129d8d6c17ab
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -25,9 +25,11 @@ require (
sigs.k8s.io/yaml v1.3.0
)

require github.com/vmware-tanzu/carvel-vendir v0.34.3

require (
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.0.0+incompatible // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
Expand Down Expand Up @@ -57,21 +59,23 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 // indirect
github.com/aws/smithy-go v1.11.2 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04 // indirect
github.com/cheggaaa/pb/v3 v3.1.0 // indirect
github.com/bmatcuk/doublestar v1.2.1 // indirect
github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 // indirect
github.com/cheggaaa/pb/v3 v3.1.2 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.13.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65 // indirect
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
github.com/cppforlife/go-patch v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/distribution/distribution/v3 v3.0.0-20221111170714-3b8fbf975279 // indirect
github.com/docker/cli v20.10.24+incompatible // indirect
github.com/docker/cli v23.0.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
Expand All @@ -82,7 +86,9 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-containerregistry v0.12.1 // indirect
github.com/google/go-containerregistry v0.14.0 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/safetext v0.0.0-20221026122733-23539d61753f // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -95,10 +101,10 @@ require (
github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57 // indirect
github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect
github.com/k14s/ytt v0.36.0 // indirect
github.com/klauspost/compress v1.15.12 // indirect
github.com/klauspost/compress v1.16.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand All @@ -109,9 +115,9 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/otiai10/copy v1.2.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/rivo/uniseg v0.4.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -120,22 +126,21 @@ require (
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/vito/go-interact v1.0.1 // indirect
github.com/vmware-tanzu/carvel-kapp-controller v0.42.0 // indirect
github.com/vmware-tanzu/carvel-vendir v0.32.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/crypto v0.2.0 // indirect
golang.org/x/crypto v0.3.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.2.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.2.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
Expand Down
Loading

0 comments on commit 4c64882

Please sign in to comment.