Skip to content

Commit

Permalink
Merge pull request rancher#2058 from PhanLe1010/release-v2.6-longhorn…
Browse files Browse the repository at this point in the history
…-1.3.1-separate-chart

Longhorn v1.3.1: Separate longhorn-crd package from main longhorn package and hide Longhorn 100.2.1+up1.3.1 chart with broken CRD install
  • Loading branch information
Arvind Iyengar authored Sep 1, 2022
2 parents b08caea + 8030224 commit 9a0293d
Show file tree
Hide file tree
Showing 63 changed files with 4,552 additions and 95 deletions.
Binary file not shown.
Binary file modified assets/longhorn/longhorn-100.2.1+up1.3.1.tgz
Binary file not shown.
Binary file added assets/longhorn/longhorn-100.2.2+up1.3.1.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: longhorn-system
catalog.cattle.io/release-name: longhorn-crd
apiVersion: v1
version: 1.3.0
appVersion: v1.3.1
description: Installs the CRDs for longhorn.
name: longhorn-crd
type: application
annotations:
catalog.cattle.io/hidden: "true"
catalog.cattle.io/release-name: longhorn-crd
catalog.cattle.io/certified: rancher
catalog.cattle.io/namespace: longhorn-system
version: 100.2.2+up1.3.1
2 changes: 2 additions & 0 deletions charts/longhorn-crd/100.2.2+up1.3.1/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# longhorn-crd
A Rancher chart that installs the CRDs used by longhorn.
66 changes: 66 additions & 0 deletions charts/longhorn-crd/100.2.2+up1.3.1/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "longhorn.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 "longhorn.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}


{{- define "longhorn.managerIP" -}}
{{- $fullname := (include "longhorn.fullname" .) -}}
{{- printf "http://%s-backend:9500" $fullname | trunc 63 | trimSuffix "-" -}}
{{- end -}}


{{- define "secret" }}
{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.privateRegistry.registryUrl (printf "%s:%s" .Values.privateRegistry.registryUser .Values.privateRegistry.registryPasswd | b64enc) | b64enc }}
{{- end }}

{{- /*
longhorn.labels generates the standard Helm labels.
*/ -}}
{{- define "longhorn.labels" -}}
app.kubernetes.io/name: {{ template "longhorn.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
{{- end -}}


{{- define "system_default_registry" -}}
{{- if .Values.global.cattle.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}
{{- end -}}

{{- define "registry_url" -}}
{{- if .Values.privateRegistry.registryUrl -}}
{{- printf "%s/" .Values.privateRegistry.registryUrl -}}
{{- else -}}
{{ include "system_default_registry" . }}
{{- end -}}
{{- end -}}

{{- /*
define the longhorn release namespace
*/ -}}
{{- define "release_namespace" -}}
{{- if .Values.namespaceOverride -}}
{{- .Values.namespaceOverride -}}
{{- else -}}
{{- .Release.Namespace -}}
{{- end -}}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backingimagedatasources.longhorn.io
spec:
Expand Down Expand Up @@ -174,10 +171,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backingimagemanagers.longhorn.io
spec:
Expand Down Expand Up @@ -358,10 +352,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backingimages.longhorn.io
spec:
Expand All @@ -371,7 +362,7 @@ spec:
clientConfig:
service:
name: longhorn-conversion-webhook
namespace: longhorn-system
namespace: {{ include "release_namespace" . }}
path: /v1/webhook/conversion
port: 9443
conversionReviewVersions:
Expand Down Expand Up @@ -532,10 +523,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backups.longhorn.io
spec:
Expand Down Expand Up @@ -724,10 +712,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backuptargets.longhorn.io
spec:
Expand All @@ -737,7 +722,7 @@ spec:
clientConfig:
service:
name: longhorn-conversion-webhook
namespace: longhorn-system
namespace: {{ include "release_namespace" . }}
path: /v1/webhook/conversion
port: 9443
conversionReviewVersions:
Expand Down Expand Up @@ -906,10 +891,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: backupvolumes.longhorn.io
spec:
Expand Down Expand Up @@ -1069,20 +1051,18 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: engineimages.longhorn.io
spec:
preserveUnknownFields: false
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: longhorn-conversion-webhook
namespace: longhorn-system
namespace: {{ include "release_namespace" . }}
path: /v1/webhook/conversion
port: 9443
conversionReviewVersions:
Expand All @@ -1107,7 +1087,7 @@ spec:
jsonPath: .spec.image
name: Image
type: string
- description: Number of volumes are using the engine image
- description: Number of resources using the engine image
jsonPath: .status.refCount
name: RefCount
type: integer
Expand Down Expand Up @@ -1149,7 +1129,7 @@ spec:
jsonPath: .spec.image
name: Image
type: string
- description: Number of volumes are using the engine image
- description: Number of resources using the engine image
jsonPath: .status.refCount
name: RefCount
type: integer
Expand Down Expand Up @@ -1259,10 +1239,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: engines.longhorn.io
spec:
Expand Down Expand Up @@ -1579,10 +1556,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: instancemanagers.longhorn.io
spec:
Expand Down Expand Up @@ -1748,20 +1722,18 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: nodes.longhorn.io
spec:
preserveUnknownFields: false
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: longhorn-conversion-webhook
namespace: longhorn-system
namespace: {{ include "release_namespace" . }}
path: /v1/webhook/conversion
port: 9443
conversionReviewVersions:
Expand Down Expand Up @@ -1977,10 +1949,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: orphans.longhorn.io
spec:
Expand Down Expand Up @@ -2241,10 +2210,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: replicas.longhorn.io
spec:
Expand Down Expand Up @@ -2432,10 +2398,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: settings.longhorn.io
spec:
Expand Down Expand Up @@ -2522,10 +2485,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: sharemanagers.longhorn.io
spec:
Expand Down Expand Up @@ -2632,10 +2592,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: snapshots.longhorn.io
spec:
Expand Down Expand Up @@ -2755,20 +2712,18 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.3.0
labels: {{- include "longhorn.labels" . | nindent 4 }}
longhorn-manager: ""
name: volumes.longhorn.io
spec:
preserveUnknownFields: false
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: longhorn-conversion-webhook
namespace: longhorn-system
namespace: {{ include "release_namespace" . }}
path: /v1/webhook/conversion
port: 9443
conversionReviewVersions:
Expand Down
2 changes: 1 addition & 1 deletion charts/longhorn/100.2.1+up1.3.1/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
catalog.cattle.io/namespace: longhorn-system
catalog.cattle.io/os: linux
catalog.cattle.io/provides-gvr: longhorn.io/v1beta1
catalog.cattle.io/rancher-version: '>= 2.6.0-0 < 2.7.0-0'
catalog.cattle.io/rancher-version: < 2.6.0-0
catalog.cattle.io/release-name: longhorn
catalog.cattle.io/type: cluster-tool
catalog.cattle.io/ui-component: longhorn
Expand Down
21 changes: 21 additions & 0 deletions charts/longhorn/100.2.2+up1.3.1/.helmignore
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 9a0293d

Please sign in to comment.