github/Reloader
1
0
Fork 0
mirror of https://github.com/stakater/Reloader.git synced 2026-02-14 09:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Safwan
2025-07-15 20:08:23 +05:00
parent 8b257a3f0c
commit f69773c588
2 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
internal/pkg/util/util.go
View File

@@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"os"
@@ -17,6 +16,7 @@ import (
"github.com/stakater/Reloader/internal/pkg/constants"
"github.com/stakater/Reloader/internal/pkg/crypto"
"github.com/stakater/Reloader/internal/pkg/options"
"github.com/stakater/Reloader/pkg/metainfo"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@@ -78,43 +78,20 @@ func PublishMetaInfoConfigmap(clientset kubernetes.Interface) {
return
}
metaInfoMap := &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "reloader-meta-info",
metaInfo := &metainfo.MetaInfo{
BuildInfo: *metainfo.NewBuildInfo(info),
ReloaderOptions: *metainfo.GetReloaderOptions(),
DeploymentInfo: metav1.ObjectMeta{
Name: os.Getenv("RELOADER_DEPLOYMENT_NAME"),
Namespace: namespace,
Labels: map[string]string{
"reloader.stakater.com/meta-info-for": "reloader-oss",
},
},
Data: map[string]string{},
}
buildInfo := parseBuildInfo(info)
buildInfoJSON, err := json.Marshal(buildInfo)
configMap := metaInfo.ToConfigMap()
if err == nil {
metaInfoMap.Data["buildinfo"] = string(buildInfoJSON)
}
reloaderOptions := GetReloaderOptions()
reloaderOptionsJSON, err := json.Marshal(reloaderOptions)
if err == nil {
metaInfoMap.Data["reloaderOptions"] = string(reloaderOptionsJSON)
}
deploymentInfoJson, err := json.Marshal(metav1.ObjectMeta{
Name: os.Getenv("RELOADER_DEPLOYMENT_NAME"),
Namespace: namespace,
})
if err == nil {
metaInfoMap.Data["deploymentInfo"] = string(deploymentInfoJson)
}
if _, err := clientset.CoreV1().ConfigMaps(namespace).Get(context.Background(), metaInfoMap.Name, metav1.GetOptions{}); err == nil {
if _, err := clientset.CoreV1().ConfigMaps(namespace).Get(context.Background(), configMap.Name, metav1.GetOptions{}); err == nil {
logrus.Info("Meta info configmap already exists, deleting it")
err = clientset.CoreV1().ConfigMaps(namespace).Delete(context.Background(), metaInfoMap.Name, metav1.DeleteOptions{})
err = clientset.CoreV1().ConfigMaps(namespace).Delete(context.Background(), configMap.Name, metav1.DeleteOptions{})
if err != nil {
logrus.Warn("Failed to delete existing meta info configmap: ", err)
return
@@ -122,7 +99,7 @@ func PublishMetaInfoConfigmap(clientset kubernetes.Interface) {
logrus.Info("Deleted existing meta info configmap")
}
_, err = clientset.CoreV1().ConfigMaps(namespace).Create(context.Background(), metaInfoMap, metav1.CreateOptions{})
_, err := clientset.CoreV1().ConfigMaps(namespace).Create(context.Background(), configMap, metav1.CreateOptions{})
if err != nil {
logrus.Warn("Failed to create meta info configmap: ", err)
}

67
internal/pkg/util/metainfo.go → pkg/metainfo/metainfo.go
View File

@@ -1,9 +1,18 @@
package util
package metainfo
import (
"encoding/json"
"runtime/debug"
"github.com/stakater/Reloader/internal/pkg/options"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
const (
MetaInfoConfigmapName = "reloader-meta-info"
MetaInfoConfigmapLabel = "reloader.stakater.com/meta-info"
MetaInfoConfigmapLabelValue = "reloader-oss"
)
type ReloaderOptions struct {
@@ -30,6 +39,12 @@ type ReloaderOptions struct {
WebhookUrl string `json:"webhookUrl"`
}
type MetaInfo struct {
BuildInfo BuildInfo `json:"buildInfo"`
ReloaderOptions ReloaderOptions `json:"reloaderOptions"`
DeploymentInfo metav1.ObjectMeta `json:"deploymentInfo"`
}
func GetReloaderOptions() *ReloaderOptions {
return &ReloaderOptions{
AutoReloadAll: options.AutoReloadAll,
@@ -65,7 +80,7 @@ type BuildInfo struct {
VCSTime string `json:"vcs.time,omitempty"`
}
func parseBuildInfo(info *debug.BuildInfo) *BuildInfo {
func NewBuildInfo(info *debug.BuildInfo) *BuildInfo {
infoMap := make(map[string]string)
infoMap["goversion"] = info.GoVersion
infoMap["version"] = info.Main.Version
@@ -87,3 +102,51 @@ func parseBuildInfo(info *debug.BuildInfo) *BuildInfo {
return metaInfo
}
func (m *MetaInfo) ToConfigMap() *v1.ConfigMap {
return &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: MetaInfoConfigmapName,
Namespace: m.DeploymentInfo.Namespace,
Labels: map[string]string{
MetaInfoConfigmapLabel: MetaInfoConfigmapLabelValue,
},
},
Data: map[string]string{
"buildInfo": toJson(m.BuildInfo),
"reloaderOptions": toJson(m.ReloaderOptions),
"deploymentInfo": toJson(m.DeploymentInfo),
},
}
}
func NewMetaInfo(configmap *v1.ConfigMap) *MetaInfo {
var buildInfo BuildInfo
if val, ok := configmap.Data["buildInfo"]; ok {
json.Unmarshal([]byte(val), &buildInfo)
}
var reloaderOptions ReloaderOptions
if val, ok := configmap.Data["reloaderOptions"]; ok {
json.Unmarshal([]byte(val), &reloaderOptions)
}
var deploymentInfo metav1.ObjectMeta
if val, ok := configmap.Data["deploymentInfo"]; ok {
json.Unmarshal([]byte(val), &deploymentInfo)
}
return &MetaInfo{
BuildInfo: buildInfo,
ReloaderOptions: reloaderOptions,
DeploymentInfo: deploymentInfo,
}
}
func toJson(data interface{}) string {
jsonData, err := json.Marshal(data)
if err != nil {
return ""
}
return string(jsonData)
}