Skip to content

Commit

Permalink
Merge pull request #167 from vmware-tanzu/588-fix-helm-oci
Browse files Browse the repository at this point in the history
fix fetching a helm chart via oci
  • Loading branch information
cppforlife authored Jun 28, 2022
2 parents 487d16c + fe7b0b3 commit aa2ac34
Show file tree
Hide file tree
Showing 630 changed files with 76,244 additions and 16,344 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
mv /tmp/helm2-unpacked/linux-amd64/helm /tmp/bin/helm2
# helm 3
wget -O- https://get.helm.sh/helm-v3.3.1-linux-amd64.tar.gz > /tmp/helm3.tgz && \
echo "81e3974927b4f76e9f679d1f6d6b45748f8c84081a571741d48b2902d816e14c /tmp/helm3.tgz" | shasum -c - && \
wget -O- https://get.helm.sh/helm-v3.8.0-linux-amd64.tar.gz > /tmp/helm3.tgz && \
echo "8408c91e846c5b9ba15eb6b1a5a79fc22dd4d33ac6ea63388e5698d1b2320c8b /tmp/helm3.tgz" | shasum -c - && \
mkdir /tmp/helm3-unpacked && tar -C /tmp/helm3-unpacked -xzvf /tmp/helm3.tgz && \
mv /tmp/helm3-unpacked/linux-amd64/helm /tmp/bin/helm3
Expand Down
9 changes: 9 additions & 0 deletions examples/helm-chart-oci-dependencies/vendir.lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- helmChart:
appVersion: 1.16.0
version: 0.1.0
path: custom-repo-custom-version
path: vendor
kind: LockConfig
11 changes: 11 additions & 0 deletions examples/helm-chart-oci-dependencies/vendir.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: vendir.k14s.io/v1alpha1
kind: Config
directories:
- path: vendor
contents:
- path: custom-repo-custom-version
helmChart:
name: chartwithdependencies
version: 0.1.0
repository:
url: oci://REPLACE_ME_REGISTRY_ADDR/helmcharts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: contour
repository: oci://localhost:51643/helmcharts
version: 7.10.1
digest: sha256:43e1d71483900f8d28a4d221bf3649df3acba552537717c8016b329dceafb405
generated: "2022-06-27T14:31:16.011852-07:00"
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v2
appVersion: 1.16.0
dependencies:
- name: contour
repository: oci://localhost:51709/helmcharts
version: 7.10.1
description: A Helm chart for Kubernetes
name: chartwithdependencies
type: application
version: 0.1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.14.1
digest: sha256:c69621f97b90b8c2e909293fbc475f0a3b0aaa4aa04de5df3e5d7a1974e5d735
generated: "2022-05-20T17:49:43.887206+02:00"
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
annotations:
category: Infrastructure
apiVersion: v2
appVersion: 1.20.1
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
tags:
- bitnami-common
version: 1.x.x
description: Contour is an open source Kubernetes ingress controller that works by
deploying the Envoy proxy as a reverse proxy and load balancer.
home: https://github.com/bitnami/charts/tree/master/bitnami/contour
icon: https://bitnami.com/assets/stacks/contour/img/contour-stack-220x234.png
keywords:
- ingress
- envoy
- contour
maintainers:
- name: cellebyte
url: https://github.com/Cellebyte
- name: Bitnami
url: https://github.com/bitnami/charts
name: contour
sources:
- https://github.com/projectcontour/contour
- https://github.com/envoyproxy/envoy
- https://github.com/bitnami/bitnami-docker-contour
- https://projectcontour.io
version: 7.10.1

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
annotations:
category: Infrastructure
apiVersion: v2
appVersion: 1.13.1
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://github.com/bitnami/charts/tree/master/bitnami/common
icon: https://bitnami.com/downloads/logos/bitnami-mark.png
keywords:
- common
- helper
- template
- function
- bitnami
maintainers:
- email: [email protected]
name: Bitnami
name: common
sources:
- https://github.com/bitnami/charts
- https://www.bitnami.com/
type: library
version: 1.14.1
Loading

0 comments on commit aa2ac34

Please sign in to comment.