Skip to content

Commit

Permalink
fix(chartmuseum) Use environment variables for storage secret
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierre Péronnet <pierre.peronnet@ovhcloud.com>
  • Loading branch information
@holyhope
holyhope committed Feb 19, 2020
1 parent 9dd0e3a commit adeba13
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 78 deletions.
5 changes: 5 additions & 0 deletions api/v1alpha1/harbor_secret_format.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ const (
HarborClairAdapterBrokerNamespaceKey = "namespace"
)

const (
HarborChartMuseumStorageKindKey = "kind"
HarborChartMuseumCacheURLKey = "url"
)

const (
HarborNotaryServerDatabaseHostKey = "host"
HarborNotaryServerDatabasePortKey = "port"
Expand Down
11 changes: 1 addition & 10 deletions assets/templates/chartmuseum/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ auth.anonymous.get: false
basic.auth.user: chart_controller
bearerauth: 0

{{- $redisUrl := env.Getenv "cache_url" }}
{{- $redisUrl := env.Getenv "CACHE_URL" }}
{{- if gt ( len $redisUrl ) 0 }}
{{- with (conv.URL $redisUrl) }}
cache: redis
Expand Down Expand Up @@ -47,12 +47,3 @@ max:

chart.post.form.field.name: chart
prov.post.form.field.name: prov

storage:
{{- range file.Walk ( env.Getenv "STORAGE_CONFIG" ) }}
{{- if not ( file.IsDir . ) }}
backend: {{ filepath.Base . | quote }}
{{- "\n" -}}{{ file.Read . | data.YAML | data.ToYAML | strings.Indent 1 " " }}
{{- end }}

{{- end }}
129 changes: 61 additions & 68 deletions controllers/harbor/components/chartmuseum/deployments.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,64 +29,61 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
operatorName := application.GetName(ctx)
harborName := c.harbor.GetName()

volumes := []corev1.Volume{}
volumeMounts := []corev1.VolumeMount{}
envs := []corev1.EnvVar{}
volumes := []corev1.Volume{{
Name: "chartmuseum",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
Medium: corev1.StorageMediumMemory,
},
},
}}
volumeMounts := []corev1.VolumeMount{{
MountPath: "/mnt/chartmuseum",
Name: "chartmuseum",
}}
envs := []corev1.EnvVar{{
Name: "STORAGE",
Value: "local",
}, {
Name: "STORAGE_LOCAL_ROOTDIR",
Value: "/mnt/chartmuseum",
}}
envFroms := []corev1.EnvFromSource{}

templateEnvFroms := []corev1.EnvFromSource{}
if c.harbor.Spec.Components.ChartMuseum.StorageSecret != "" {
volumes = []corev1.Volume{}
volumeMounts = []corev1.VolumeMount{}

if c.harbor.Spec.Components.ChartMuseum.CacheSecret != "" {
templateEnvFroms = append(templateEnvFroms, corev1.EnvFromSource{
Prefix: "cache_",
SecretRef: &corev1.SecretEnvSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.Spec.Components.ChartMuseum.CacheSecret,
envs = []corev1.EnvVar{{
Name: "STORAGE",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.Spec.Components.ChartMuseum.StorageSecret,
},
Key: containerregistryv1alpha1.HarborChartMuseumStorageKindKey,
},
Optional: &varTrue,
},
})
}
}}

var storageVolumeSource corev1.VolumeSource
if c.harbor.Spec.Components.ChartMuseum.StorageSecret == "" {
storageVolumeSource.EmptyDir = &corev1.EmptyDirVolumeSource{}

volumes = append(volumes, corev1.Volume{
Name: "chartmuseum",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
Medium: corev1.StorageMediumMemory,
envFroms = []corev1.EnvFromSource{{
SecretRef: &corev1.SecretEnvSource{
Optional: &varFalse,
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.Spec.Components.ChartMuseum.StorageSecret,
},
},
})

volumeMounts = append(volumeMounts, corev1.VolumeMount{
MountPath: "/mnt/chartmuseum",
Name: "chartmuseum",
})

envs = append(envs, corev1.EnvVar{
Name: "STORAGE",
Value: "local",
}, corev1.EnvVar{
Name: "STORAGE_LOCAL_ROOTDIR",
Value: "/mnt/chartmuseum",
})
} else {
storageVolumeSource.Secret = &corev1.SecretVolumeSource{
SecretName: c.harbor.Spec.Components.ChartMuseum.StorageSecret,
}
envFroms = append(envFroms, corev1.EnvFromSource{
Prefix: "STORAGE_",
}, {
// Some storage driver requires environment variable, add it from secret data
// See https://chartmuseum.com/docs/#using-with-openstack-object-storage
SecretRef: &corev1.SecretEnvSource{
Optional: &varTrue,
Optional: &varFalse,
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.Spec.Components.ChartMuseum.StorageSecret,
},
},
})
}}
}

return []*appsv1.Deployment{
Expand Down Expand Up @@ -131,9 +128,6 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
}, {
Name: "config-storage",
VolumeSource: storageVolumeSource,
}, {
Name: "config-template",
VolumeSource: corev1.VolumeSource{
Expand All @@ -158,10 +152,6 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
MountPath: path.Join("/workdir", configName),
ReadOnly: true,
SubPath: configName,
}, {
Name: "config-storage",
MountPath: "/opt/configuration/storage",
ReadOnly: true,
}, {
Name: "config",
MountPath: "/processed",
Expand All @@ -170,11 +160,18 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
},
Env: []corev1.EnvVar{
{
Name: "STORAGE_CONFIG",
Value: "/opt/configuration/storage",
Name: "CACHE_URL",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.Spec.Components.ChartMuseum.CacheSecret,
},
Key: containerregistryv1alpha1.HarborChartMuseumCacheURLKey,
Optional: &varTrue,
},
},
},
},
EnvFrom: templateEnvFroms,
},
},
Containers: []corev1.Container{
Expand All @@ -189,13 +186,11 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
Command: []string{"/home/chart/chartm"},
Args: []string{"-c", path.Join(configPath, configName)},

VolumeMounts: append([]corev1.VolumeMount{
{
MountPath: path.Join(configPath, configName),
Name: "config",
SubPath: configName,
},
}, volumeMounts...),
VolumeMounts: append(volumeMounts, corev1.VolumeMount{
MountPath: path.Join(configPath, configName),
Name: "config",
SubPath: configName,
}),

Env: append([]corev1.EnvVar{
{
Expand All @@ -212,16 +207,14 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
},
}, envs...),

EnvFrom: append([]corev1.EnvFromSource{
{
ConfigMapRef: &corev1.ConfigMapEnvSource{
Optional: &varFalse,
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.NormalizeComponentName(containerregistryv1alpha1.ChartMuseumName),
},
EnvFrom: append(envFroms, corev1.EnvFromSource{
ConfigMapRef: &corev1.ConfigMapEnvSource{
Optional: &varFalse,
LocalObjectReference: corev1.LocalObjectReference{
Name: c.harbor.NormalizeComponentName(containerregistryv1alpha1.ChartMuseumName),
},
},
}, envFroms...),
}),

ImagePullPolicy: corev1.PullAlways,
LivenessProbe: &corev1.Probe{
Expand Down

0 comments on commit adeba13

Please sign in to comment.