Merge pull request #2077 from technosophos/feat/2036-appVersion

feat(proto): add appVersion field

_proto/hapi/chart/metadata.proto

@@ -70,4 +70,7 @@ message Metadata {
 
 	// The tags to check to enable chart
 	string tags = 12;
+
+	// The version of the application enclosed inside of this chart.
+	string appVersion = 13;
 }

docs/charts.md

@@ -53,6 +53,7 @@ maintainers: # (optional)
     email: The maintainer's email (optional for each maintainer)
 engine: gotpl # The name of the template engine (optional, defaults to gotpl)
 icon: A URL to an SVG or PNG image to be used as an icon (optional).
+appVersion: The version of the app that this contains (optional). This needn't be SemVer.
 ```
 
 If you are familiar with the `Chart.yaml` file format for Helm Classic, you will
@@ -91,6 +92,14 @@ in the `Chart.yaml` as a token in the package name. The system assumes
 that the version number in the chart package name matches the version number in
 the `Chart.yaml`. Failure to meet this assumption will cause an error.
 
+### The appVersion field
+
+Note that the `appVersion` field is not related to the `version` field. It is
+a way of specifying the version of the application. For example, the `drupal`
+chart may have an `appVersion: 8.2.1`, indicating that the version of Drupal
+included in the chart (by default) is `8.2.1`. This field is informational, and
+has no impact on chart version calculations.
+
 ## Chart LICENSE, README and NOTES
 
 Charts can also contain files that describe the installation, configuration, usage and license of a

docs/examples/alpine/Chart.yaml

@@ -4,3 +4,4 @@ version: 0.1.0
 home: https://k8s.io/helm
 sources:
   - https://github.com/kubernetes/helm
+appVersion: 3.3

pkg/proto/hapi/chart/metadata.pb.go

@@ -74,7 +74,9 @@ type Metadata struct {
 	// The condition to check to enable chart
 	Condition string `protobuf:"bytes,11,opt,name=condition" json:"condition,omitempty"`
 	// The tags to check to enable chart
-	Tags []string `protobuf:"bytes,12,opt,name=tags" json:"tags,omitempty"`
+	Tags string `protobuf:"bytes,12,opt,name=tags" json:"tags,omitempty"`
+	// The version of the application enclosed inside of this chart.
+	AppVersion string `protobuf:"bytes,13,opt,name=appVersion" json:"appVersion,omitempty"`
 }
 
 func (m *Metadata) Reset()                    { *m = Metadata{} }
@@ -98,25 +100,26 @@ func init() {
 func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 311 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0xcd, 0x4b, 0xc3, 0x40,
-	0x10, 0xc5, 0xed, 0x47, 0x92, 0x66, 0xe2, 0xa1, 0x0c, 0x52, 0x56, 0x11, 0x09, 0x3d, 0xf5, 0x94,
-	0x82, 0x82, 0x78, 0x16, 0xc4, 0x83, 0xb6, 0x95, 0xe2, 0x07, 0x78, 0x5b, 0x93, 0xa5, 0x5d, 0x34,
-	0xbb, 0x61, 0x77, 0x55, 0xfc, 0xe7, 0x45, 0x76, 0x92, 0x36, 0x39, 0x78, 0x9b, 0xf7, 0x5e, 0xe6,
-	0x0d, 0xbf, 0x2c, 0x1c, 0x6f, 0x79, 0x25, 0xe7, 0xf9, 0x96, 0x1b, 0x37, 0x2f, 0x85, 0xe3, 0x05,
-	0x77, 0x3c, 0xab, 0x8c, 0x76, 0x1a, 0xc1, 0x47, 0x19, 0x45, 0xd3, 0x4b, 0x80, 0x05, 0x97, 0xca,
-	0x71, 0xa9, 0x84, 0x41, 0x84, 0xa1, 0xe2, 0xa5, 0x60, 0xbd, 0xb4, 0x37, 0x8b, 0xd7, 0x34, 0xe3,
-	0x11, 0x04, 0xa2, 0xe4, 0xf2, 0x83, 0xf5, 0xc9, 0xac, 0xc5, 0xf4, 0xb7, 0x0f, 0xa3, 0x45, 0x53,
-	0xfb, 0xef, 0x1a, 0xc2, 0x70, 0xab, 0x4b, 0xd1, 0x6c, 0xd1, 0x8c, 0x0c, 0x22, 0xab, 0x3f, 0x4d,
-	0x2e, 0x2c, 0x1b, 0xa4, 0x83, 0x59, 0xbc, 0xde, 0x49, 0x9f, 0x7c, 0x09, 0x63, 0xa5, 0x56, 0x6c,
-	0x48, 0x0b, 0x3b, 0x89, 0x29, 0x24, 0x85, 0xb0, 0xb9, 0x91, 0x95, 0xf3, 0x69, 0x40, 0x69, 0xd7,
-	0xc2, 0x13, 0x18, 0xbd, 0x8b, 0x9f, 0x6f, 0x6d, 0x0a, 0xcb, 0x42, 0xaa, 0xdd, 0x6b, 0xbc, 0x82,
-	0xa4, 0xdc, 0xe3, 0x59, 0x16, 0xa5, 0x83, 0x59, 0x72, 0x3e, 0xc9, 0xda, 0x1f, 0x90, 0xb5, 0xf4,
-	0xeb, 0xee, 0xa7, 0x38, 0x81, 0x50, 0xa8, 0x8d, 0x54, 0x82, 0x8d, 0xe8, 0x64, 0xa3, 0x3c, 0x97,
-	0xcc, 0xb5, 0x62, 0x71, 0xcd, 0xe5, 0x67, 0x3c, 0x03, 0xe0, 0x95, 0x7c, 0x6e, 0x00, 0x80, 0x92,
-	0x8e, 0x83, 0xa7, 0x10, 0xe7, 0x5a, 0x15, 0x92, 0x08, 0x12, 0x8a, 0x5b, 0xc3, 0x37, 0x3a, 0xbe,
-	0xb1, 0xec, 0xb0, 0x6e, 0xf4, 0xf3, 0x34, 0x85, 0xf0, 0xa6, 0xbe, 0x97, 0x40, 0xf4, 0xb4, 0xbc,
-	0x5b, 0xae, 0x5e, 0x96, 0xe3, 0x03, 0x8c, 0x21, 0xb8, 0x5d, 0x3d, 0x3e, 0xdc, 0x8f, 0x7b, 0xd7,
-	0xd1, 0x6b, 0x40, 0x00, 0x6f, 0x21, 0x3d, 0xea, 0xc5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5a,
-	0xa8, 0xcd, 0xe1, 0xf1, 0x01, 0x00, 0x00,
+	// 321 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0x5f, 0x4b, 0xc3, 0x30,
+	0x14, 0xc5, 0x9d, 0x5d, 0xdb, 0xf5, 0x56, 0x61, 0x5c, 0x64, 0x44, 0x11, 0x29, 0x7b, 0xda, 0x53,
+	0x07, 0x0a, 0xe2, 0xb3, 0x20, 0x3e, 0xe8, 0x36, 0x19, 0xfe, 0x01, 0xdf, 0x62, 0x1b, 0xb6, 0xa0,
+	0x4d, 0x4a, 0x12, 0x15, 0xbf, 0x8c, 0x9f, 0x55, 0x72, 0xdb, 0x6e, 0x7b, 0xf0, 0xed, 0x9e, 0x73,
+	0x7a, 0x4f, 0xf3, 0x4b, 0xe0, 0x78, 0xcd, 0x6b, 0x39, 0x2d, 0xd6, 0xdc, 0xb8, 0x69, 0x25, 0x1c,
+	0x2f, 0xb9, 0xe3, 0x79, 0x6d, 0xb4, 0xd3, 0x08, 0x3e, 0xca, 0x29, 0x1a, 0x5f, 0x02, 0xcc, 0xb8,
+	0x54, 0x8e, 0x4b, 0x25, 0x0c, 0x22, 0xf4, 0x15, 0xaf, 0x04, 0xeb, 0x65, 0xbd, 0x49, 0xb2, 0xa4,
+	0x19, 0x8f, 0x20, 0x14, 0x15, 0x97, 0x1f, 0x6c, 0x9f, 0xcc, 0x46, 0x8c, 0x7f, 0x03, 0x18, 0xcc,
+	0xda, 0xda, 0x7f, 0xd7, 0x10, 0xfa, 0x6b, 0x5d, 0x89, 0x76, 0x8b, 0x66, 0x64, 0x10, 0x5b, 0xfd,
+	0x69, 0x0a, 0x61, 0x59, 0x90, 0x05, 0x93, 0x64, 0xd9, 0x49, 0x9f, 0x7c, 0x09, 0x63, 0xa5, 0x56,
+	0xac, 0x4f, 0x0b, 0x9d, 0xc4, 0x0c, 0xd2, 0x52, 0xd8, 0xc2, 0xc8, 0xda, 0xf9, 0x34, 0xa4, 0x74,
+	0xd7, 0xc2, 0x13, 0x18, 0xbc, 0x8b, 0x9f, 0x6f, 0x6d, 0x4a, 0xcb, 0x22, 0xaa, 0xdd, 0x68, 0xbc,
+	0x82, 0xb4, 0xda, 0xe0, 0x59, 0x16, 0x67, 0xc1, 0x24, 0x3d, 0x1f, 0xe5, 0xdb, 0x0b, 0xc8, 0xb7,
+	0xf4, 0xcb, 0xdd, 0x4f, 0x71, 0x04, 0x91, 0x50, 0x2b, 0xa9, 0x04, 0x1b, 0xd0, 0x2f, 0x5b, 0xe5,
+	0xb9, 0x64, 0xa1, 0x15, 0x4b, 0x1a, 0x2e, 0x3f, 0xe3, 0x19, 0x00, 0xaf, 0xe5, 0x73, 0x0b, 0x00,
+	0x94, 0xec, 0x38, 0x78, 0x0a, 0x49, 0xa1, 0x55, 0x29, 0x89, 0x20, 0xa5, 0x78, 0x6b, 0xf8, 0x46,
+	0xc7, 0x57, 0x96, 0x1d, 0x34, 0x8d, 0x7e, 0x6e, 0x1a, 0xeb, 0xae, 0xf1, 0xb0, 0x6b, 0xec, 0x9c,
+	0x71, 0x06, 0xd1, 0x4d, 0x73, 0x9e, 0x14, 0xe2, 0xa7, 0xf9, 0xdd, 0x7c, 0xf1, 0x32, 0x1f, 0xee,
+	0x61, 0x02, 0xe1, 0xed, 0xe2, 0xf1, 0xe1, 0x7e, 0xd8, 0xbb, 0x8e, 0x5f, 0x43, 0x02, 0x7c, 0x8b,
+	0xe8, 0xd1, 0x2f, 0xfe, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0xc5, 0x76, 0x7c, 0x11, 0x02, 0x00,
+	0x00,
 }