Merge pull request #73 from weaveworks/more-profiles

More profiles

Author: tomhuang12

charts/index.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
-name: ingress
+name: ingress-nginx
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
-description: A Weaveworks Helm chart for ingress
+description: A Weaveworks Helm chart for ingress-nginx
 type: application
 version: 0.0.5
 kubeVersion: ">=1.16.0-0"
@@ -15,8 +15,12 @@ keywords:
 - nginx
 - nginx-ingress
 
+maintainers:
+  - name: Weaveworks
+    email: [email protected]
+
 annotations:
-  "weave.works/profile": ingress
+  "weave.works/profile": ingress-nginx
   "weave.works/links": |
     - name: Chart Sources
       url:  https://kubernetes.github.io/ingress-nginx

charts/ingress-0.0.1.tgz

@@ -0,0 +1 @@
+The ingress-nginx controller has been installed.

charts/ingress/.helmignore charts/ingress-nginx/.helmignore

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "ingress.name" -}}
+{{- define "ingress-nginx.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "ingress.fullname" -}}
+{{- define "ingress-nginx.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "ingress.chart" -}}
+{{- define "ingress-nginx.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "ingress.labels" -}}
-helm.sh/chart: {{ include "ingress.chart" . }}
-{{ include "ingress.selectorLabels" . }}
+{{- define "ingress-nginx.labels" -}}
+helm.sh/chart: {{ include "ingress-nginx.chart" . }}
+{{ include "ingress-nginx.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "ingress.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "ingress.name" . }}
+{{- define "ingress-nginx.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ingress-nginx.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "ingress.serviceAccountName" -}}
+{{- define "ingress-nginx.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "ingress.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "ingress-nginx.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

charts/ingress/Chart.lock charts/ingress-nginx/Chart.lock

@@ -1,8 +1,8 @@
-ingress-nginx: 
+ingress-nginx:
   controller:
     service:
       annotations:
         service.beta.kubernetes.io/aws-load-balancer-internal: "true"
         networking.gke.io/load-balancer-type: "Internal"
         service.beta.kubernetes.io/azure-load-balancer-internal: "true"
-        service.beta.kubernetes.io/oci-load-balancer-internal: "true"
+        service.beta.kubernetes.io/oci-load-balancer-internal: "true"

charts/ingress/Chart.yaml charts/ingress-nginx/Chart.yaml

@@ -0,0 +1,21 @@
+# 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

charts/ingress/charts/ingress-nginx-4.0.6.tgz charts/ingress-nginx/charts/ingress-nginx-4.0.6.tgz

@@ -0,0 +1,6 @@
+dependencies:
+- name: ingress-nginx
+  repository: file://../ingress-nginx
+  version: 0.0.5
+digest: sha256:adb8bd6fdb74cf879dd026d6457c6db7a9256064eb6c2293e6ba08130c7d41cb
+generated: "2021-11-08T13:53:50.353293-05:00"

charts/ingress-nginx/templates/NOTES.txt

@@ -0,0 +1,27 @@
+apiVersion: v2
+name: sockshop
+description: A Weaveworks Helm chart for sockshop microservices demo
+version: 0.0.1
+dependencies:
+  - name: ingress-nginx
+    version: "~0.0.5"
+    repository: "file://../ingress-nginx"
+home: https://github.com/weaveworks/profiles-catalog
+sources:
+  - https://github.com/microservices-demo/microservices-demo/tree/master/deploy/kubernetes/helm-chart
+
+keywords:
+- microservices
+- sockshop
+
+maintainers:
+  - name: Weaveworks
+    email: [email protected]
+
+annotations:
+  "weave.works/profile": sockshop
+  "weave.works/links": |
+    - name: Chart Sources
+      url: https://github.com/microservices-demo/microservices-demo/tree/master/deploy/kubernetes/helm-chart
+    - name: Upstream Project
+      url: https://github.com/microservices-demo/microservices-demo

charts/ingress/templates/_helpers.tpl charts/ingress-nginx/templates/_helpers.tpl

@@ -0,0 +1 @@
+

charts/ingress/values.yaml charts/ingress-nginx/values.yaml

@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}