sync dev (#85)

* feat(colors): add icon colors (#84)

* fix(helm): new image version

---------

Co-authored-by: ullberg-github-app <ullberg-github-app[bot]@users.noreply.github.com>

charts/hajimari/templates/crd.yaml

@@ -41,6 +41,8 @@ spec:
                   type: string
                 icon:
                   type: string
+                iconColor:
+                  type: string
                 url:
                   type: string
                 info:

charts/hajimari/values.yaml

@@ -11,7 +11,7 @@ image:
   # -- image pull policy
   pullPolicy: IfNotPresent
   # -- image tag
-  tag: v0.4.3
+  tag: v0.4.4
 
 # -- environment variables.
 # @default -- See below

frontend/src/lib/AppList/AppGroup.svelte

@@ -26,10 +26,10 @@
         {#if app.icon.includes("//")}
           <img src={app.icon} alt="app icon for {app.name}" />
         {:else if app.icon.includes(":") || !app.icon}
-          <Icon icon={app.icon ? app.icon : defaultIcon} />
+          <Icon icon={app.icon ? app.icon : defaultIcon} color="{app.iconColor}" />
         {:else}
           <!-- support old icon format to ease transition -->
-          <Icon icon="mdi:{app.icon ? app.icon : defaultIcon}" />
+          <Icon icon="mdi:{app.icon ? app.icon : defaultIcon}" color="{app.iconColor}" />
         {/if}
       </a>
       {#if app.replicas.total > 0 && showStatus}

internal/annotations/annotations.go

@@ -3,6 +3,8 @@ package annotations
 const (
 	// HajimariIconAnnotation const used for hajimari icon
 	HajimariIconAnnotation = "hajimari.io/icon"
+	// HajimariIconColorAnnotation const used for hajimari icon color
+	HajimariIconColorAnnotation = "hajimari.io/iconColor"
 	// HajimariEnableAnnotation const used for checking whether an ingress is exposed to hajimari
 	HajimariEnableAnnotation = "hajimari.io/enable"
 	// HajimariAppNameAnnotation const used for overriding the name of the app

internal/hajimari/crdapps/apps.go

@@ -99,6 +99,7 @@ func appsToHajimariApps(apps []unstructured.Unstructured) (appGroups []models.Ap
 			appGroups[i].Apps = append(appGroups[i].Apps, models.App{
 				Name:        wrapper.GetName(),
 				Icon:        wrapper.GetAnnotationValue(annotations.HajimariIconAnnotation),
+				IconColor:   wrapper.GetIconColor(),
 				URL:         wrapper.GetURL(),
 				TargetBlank: wrapper.GetTargetBlank(),
 				Info:        wrapper.GetInfo(),

internal/hajimari/ingressapps/apps.go

@@ -88,6 +88,7 @@ func convertIngressesToHajimariApps(ingresses []v1.Ingress, rsg util.ReplicaStat
 				appGroups[i].Apps = append(appGroups[i].Apps, models.App{
 					Name:        wrapper.GetName(),
 					Icon:        wrapper.GetAnnotationValue(annotations.HajimariIconAnnotation),
+					IconColor:   wrapper.GetIconColor(),
 					URL:         wrapper.GetURL(),
 					Info:        wrapper.GetInfo(),
 					TargetBlank: wrapper.GetTargetBlank(),
@@ -102,6 +103,7 @@ func convertIngressesToHajimariApps(ingresses []v1.Ingress, rsg util.ReplicaStat
 				appGroups[i].Apps = append(appGroups[i].Apps, models.App{
 					Name:        wrapper.GetName(),
 					Icon:        wrapper.GetAnnotationValue(annotations.HajimariIconAnnotation),
+					IconColor:   wrapper.GetIconColor(),
 					URL:         wrapper.GetURL(),
 					TargetBlank: wrapper.GetTargetBlank(),
 					Info:        wrapper.GetInfo(),

internal/kube/types/v1alpha1/types.go

@@ -17,6 +17,7 @@ type ApplicationSpec struct {
 	Name        string `json:"name"`
 	Group       string `json:"group,omitempty"`
 	Icon        string `json:"icon,omitempty"`
+	IconColor   string `json:"icon,omitempty"`
 	URL         string `json:"url"`
 	Info        string `json:"info,omitempty"`
 	TargetBlank bool   `json:"targetBlank,omitempty"`

internal/kube/wrappers/app.go

@@ -44,6 +44,11 @@ func (aw *AppWrapper) GetAnnotationValue(annotationKey string) string {
 	return aw.app.Spec.Icon
 }
 
+// GetIconColor func extracts icon color of the app wrapped by the object
+func (aw *AppWrapper) GetIconColor() string {
+	return aw.app.Spec.IconColor
+}
+
 // GetTargetBlank func extracts open in new window feature gate from the app
 // @default false
 func (aw *AppWrapper) GetTargetBlank() bool {

internal/kube/wrappers/ingress.go

@@ -158,3 +158,11 @@ func (iw *IngressWrapper) GetLocation() int {
 	}
 	return defaultLocation
 }
+
+// GetIconColor func extracts icon color of the ingress wrapped by the object
+func (iw *IngressWrapper) GetIconColor() string {
+	if iconColorFromAnnotation := iw.GetAnnotationValue(annotations.HajimariIconColorAnnotation); iconColorFromAnnotation != "" {
+		return iconColorFromAnnotation
+	}
+	return ""
+}

internal/models/app.go

@@ -3,6 +3,7 @@ package models
 type App struct {
 	Name        string      `json:"name"`
 	Icon        string      `json:"icon"`
+	IconColor   string      `json:"iconColor"`
 	URL         string      `json:"url"`
 	Info        string      `json:"info"`
 	TargetBlank bool        `json:"targetBlank"`