Skip to content

Commit

Permalink
Update Application Definitions (#44)
Browse files Browse the repository at this point in the history
Coax these into using the shared metadata standard.  They get the name
and description for free, and conform to IDs.  They also get a creation
time, which is useful for highlighting new applications to users.
  • Loading branch information
spjmurray authored Jun 4, 2024
1 parent 0c75e51 commit b8520a1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 24 deletions.
4 changes: 2 additions & 2 deletions charts/core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: A Helm chart for deploying Unikorn Core

type: application

version: v0.1.37
appVersion: v0.1.37
version: v0.1.38
appVersion: v0.1.38

icon: https://assets.unikorn-cloud.org/images/logos/dark-on-light/icon.svg
11 changes: 3 additions & 8 deletions charts/core/crds/unikorn-cloud.org_helmapplications.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ spec:
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.labels['unikorn-cloud\.org/name']
name: display name
type: string
- jsonPath: .metadata.creationTimestamp
name: age
type: date
Expand Down Expand Up @@ -44,9 +47,6 @@ spec:
type: object
spec:
properties:
description:
description: Description describes what the application does.
type: string
documentation:
description: Documentation defines a URL to 3rd party documentation.
type: string
Expand All @@ -63,9 +63,6 @@ spec:
description: License describes the licence the application is released
under.
type: string
name:
description: Name is the human readable application name.
type: string
tags:
description: |-
Tags allows an application to be given a free-form set of labels
Expand Down Expand Up @@ -186,11 +183,9 @@ spec:
rule: '!(has(self.chart) && has(self.path))'
type: array
required:
- description
- documentation
- icon
- license
- name
- tags
type: object
status:
Expand Down
5 changes: 1 addition & 4 deletions pkg/apis/unikorn/v1alpha1/helmapplication_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type HelmApplicationList struct {
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:resource:scope=Cluster,categories=unikorn
// +kubebuilder:printcolumn:name="display name",type="string",JSONPath=".metadata.labels['unikorn-cloud\\.org/name']"
// +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
type HelmApplication struct {
metav1.TypeMeta `json:",inline"`
Expand All @@ -43,10 +44,6 @@ type HelmApplication struct {
}

type HelmApplicationSpec struct {
// Name is the human readable application name.
Name *string `json:"name"`
// Description describes what the application does.
Description *string `json:"description"`
// Documentation defines a URL to 3rd party documentation.
Documentation *string `json:"documentation"`
// License describes the licence the application is released under.
Expand Down
10 changes: 0 additions & 10 deletions pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b8520a1

Please sign in to comment.