Skip to content

Commit 5b342d9

Browse files
ShalucikShalucik
authored
Merge pull request #110 from PDOK/wr/remove-cm-secret-injection
remove finding blobs and postgres configmap/secret
2 parents dd847ae + bc6b56a commit 5b342d9

File tree

20 files changed

+188
-130
lines changed

20 files changed

+188
-130
lines changed

‎internal/controller/blobdownload/blob_download.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func GetScript() string {
3333
return GpkgDownloadScript
3434
}
3535

36-
func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, blobsConfigName, blobsSecretName string) (*corev1.Container, error) {
36+
func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images) (*corev1.Container, error) {
3737
blobkeys := []string{}
3838
for _, gpkg := range obj.GeoPackages() {
3939
// Deduplicate blobkeys to prevent double downloads
@@ -56,10 +56,6 @@ func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images,
5656
Value: strings.Join(blobkeys, ";"),
5757
},
5858
},
59-
EnvFrom: []corev1.EnvFromSource{
60-
utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, blobsConfigName),
61-
utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, blobsSecretName),
62-
},
6359
Resources: corev1.ResourceRequirements{
6460
Requests: corev1.ResourceList{
6561
corev1.ResourceCPU: resource.MustParse("0.15"),

‎internal/controller/deployment.go‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/pdok/mapserver-operator/internal/controller/mapserver"
1515
"github.com/pdok/mapserver-operator/internal/controller/ogcwebserviceproxy"
1616
"github.com/pdok/mapserver-operator/internal/controller/types"
17-
"github.com/pdok/smooth-operator/pkg/k8s"
1817
smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
1918
appsv1 "k8s.io/api/apps/v1"
2019
corev1 "k8s.io/api/core/v1"
@@ -24,13 +23,6 @@ import (
2423
ctrl "sigs.k8s.io/controller-runtime"
2524
)
2625

27-
const (
28-
blobsConfigPrefix = "blobs-"
29-
blobsSecretPrefix = "blobs-"
30-
postgisConfigPrefix = "postgres-"
31-
postgisSecretPrefix = "postgres-"
32-
)
33-
3426
var storageClassName string
3527

3628
func SetStorageClassName(name string) {
@@ -65,19 +57,14 @@ func mutateDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, deployment *a
6557
},
6658
}
6759

68-
blobsSecret, err := k8s.GetSecret(getReconcilerClient(r), obj.GetNamespace(), blobsSecretPrefix, make(map[string]string))
69-
if err != nil {
70-
return err
71-
}
72-
7360
initContainers, err := getInitContainerForDeployment(r, obj)
7461
if err != nil {
7562
return err
7663
}
7764
setTerminationMessage(initContainers)
7865

7966
images := getReconcilerImages(r)
80-
containers, err := getContainers(obj, images, blobsSecret)
67+
containers, err := getContainers(obj, images)
8168
if err != nil {
8269
return err
8370
}
@@ -140,18 +127,9 @@ func getPodAnnotations(deployment *appsv1.Deployment) map[string]string {
140127
}
141128

142129
func getInitContainerForDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O) ([]corev1.Container, error) {
143-
blobsConfig, err := k8s.GetConfigMap(getReconcilerClient(r), obj.GetNamespace(), blobsConfigPrefix, make(map[string]string))
144-
if err != nil {
145-
return nil, err
146-
}
147-
148-
blobsSecret, err := k8s.GetSecret(getReconcilerClient(r), obj.GetNamespace(), blobsSecretPrefix, make(map[string]string))
149-
if err != nil {
150-
return nil, err
151-
}
152130

153131
images := getReconcilerImages(r)
154-
blobDownloadInitContainer, err := blobdownload.GetBlobDownloadInitContainer(obj, *images, blobsConfig.Name, blobsSecret.Name)
132+
blobDownloadInitContainer, err := blobdownload.GetBlobDownloadInitContainer(obj, *images)
155133
if err != nil {
156134
return nil, err
157135
}
@@ -166,16 +144,7 @@ func getInitContainerForDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O)
166144
}
167145

168146
if obj.Mapfile() == nil {
169-
postgresConfig, err := k8s.GetConfigMap(getReconcilerClient(r), obj.GetNamespace(), postgisConfigPrefix, make(map[string]string))
170-
if err != nil {
171-
return nil, err
172-
}
173-
174-
postgresSecret, err := k8s.GetSecret(getReconcilerClient(r), obj.GetNamespace(), postgisSecretPrefix, make(map[string]string))
175-
if err != nil {
176-
return nil, err
177-
}
178-
mapfileGeneratorInitContainer, err := mapfilegenerator.GetMapfileGeneratorInitContainer(obj, *images, postgresConfig.Name, postgresSecret.Name)
147+
mapfileGeneratorInitContainer, err := mapfilegenerator.GetMapfileGeneratorInitContainer(obj, *images)
179148
if err != nil {
180149
return nil, err
181150
}
@@ -204,8 +173,8 @@ func getInitContainerForDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O)
204173
return initContainers, nil
205174
}
206175

207-
func getContainers[O pdoknlv3.WMSWFS](obj O, images *types.Images, blobsSecret *corev1.Secret) ([]corev1.Container, error) {
208-
mapserverContainer, err := mapserver.GetMapserverContainer(obj, *images, blobsSecret.Name)
176+
func getContainers[O pdoknlv3.WMSWFS](obj O, images *types.Images) ([]corev1.Container, error) {
177+
mapserverContainer, err := mapserver.GetMapserverContainer(obj, *images)
209178
if err != nil {
210179
return nil, err
211180
}

‎internal/controller/mapfilegenerator/mapfile_generator.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
corev1 "k8s.io/api/core/v1"
1616
)
1717

18-
func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, postgisConfigName, postgisSecretName string) (*corev1.Container, error) {
18+
func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images) (*corev1.Container, error) {
1919
initContainer := corev1.Container{
2020
Name: constants.MapfileGeneratorName,
2121
Image: images.MapfileGeneratorImage,
@@ -37,13 +37,7 @@ func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Ima
3737
stylingFilesVolMount := corev1.VolumeMount{Name: constants.ConfigMapStylingFilesVolumeName, MountPath: "/styling", ReadOnly: true}
3838
initContainer.VolumeMounts = append(initContainer.VolumeMounts, stylingFilesVolMount)
3939
}
40-
// Additional mapfile-generator configuration
41-
if obj.HasPostgisData() {
42-
initContainer.EnvFrom = []corev1.EnvFromSource{
43-
utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, postgisConfigName),
44-
utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, postgisSecretName),
45-
}
46-
}
40+
4741
return &initContainer, nil
4842
}
4943

‎internal/controller/mapserver/deployment.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
const mimeTextXML = "text/xml"
1919

20-
func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, blobsSecretName string) (*corev1.Container, error) {
20+
func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images) (*corev1.Container, error) {
2121
livenessProbe, readinessProbe, startupProbe, err := getProbes(obj)
2222
if err != nil {
2323
return nil, err
@@ -38,15 +38,6 @@ func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, blobsS
3838
Value: "/srv/mapserver/config/default_mapserver.conf",
3939
},
4040
GetMapfileEnvVar(obj),
41-
{
42-
Name: "AZURE_STORAGE_CONNECTION_STRING",
43-
ValueFrom: &corev1.EnvVarSource{
44-
SecretKeyRef: &corev1.SecretKeySelector{
45-
LocalObjectReference: corev1.LocalObjectReference{Name: blobsSecretName},
46-
Key: "AZURE_STORAGE_CONNECTION_STRING",
47-
},
48-
},
49-
},
5041
},
5142
VolumeMounts: getVolumeMounts(obj.Mapfile() != nil),
5243
Resources: corev1.ResourceRequirements{

‎internal/controller/suite_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ var _ = BeforeSuite(func() {
133133
// Deploy blob configmap + secret
134134
blobConfig := &corev1.ConfigMap{
135135
ObjectMeta: metav1.ObjectMeta{
136-
Name: blobsConfigPrefix + "testtest",
136+
Name: "blobs-testtest",
137137
Namespace: metav1.NamespaceDefault,
138138
},
139139
}
@@ -142,7 +142,7 @@ var _ = BeforeSuite(func() {
142142

143143
blobSecret := &corev1.Secret{
144144
ObjectMeta: metav1.ObjectMeta{
145-
Name: blobsSecretPrefix + "testtest",
145+
Name: "blobs-testtest",
146146
Namespace: metav1.NamespaceDefault,
147147
},
148148
}
@@ -152,7 +152,7 @@ var _ = BeforeSuite(func() {
152152
// Deploy postgres configmap + secret
153153
postgresConfig := &corev1.ConfigMap{
154154
ObjectMeta: metav1.ObjectMeta{
155-
Name: postgisConfigPrefix + "testtest",
155+
Name: "postgres-testtest",
156156
Namespace: metav1.NamespaceDefault,
157157
},
158158
}
@@ -161,7 +161,7 @@ var _ = BeforeSuite(func() {
161161

162162
postgresSecret := &corev1.Secret{
163163
ObjectMeta: metav1.ObjectMeta{
164-
Name: postgisSecretPrefix + "testtest",
164+
Name: "postgres-testtest",
165165
Namespace: metav1.NamespaceDefault,
166166
},
167167
}

‎internal/controller/test_data/wfs/complete/expected/deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ spec:
5656
containers:
5757
- name: mapserver
5858
env:
59+
- name: AZURE_STORAGE_CONNECTION_STRING
60+
valueFrom:
61+
secretKeyRef:
62+
key: AZURE_STORAGE_CONNECTION_STRING
63+
name: blobs-testtest
5964
- name: SERVICE_TYPE
6065
value: WFS
6166
- name: MAPSERVER_CONFIG_FILE
6267
value: "/srv/mapserver/config/default_mapserver.conf"
6368
- name: MS_MAPFILE
6469
value: /srv/data/config/mapfile/service.map
65-
- name: AZURE_STORAGE_CONNECTION_STRING
66-
valueFrom:
67-
secretKeyRef:
68-
key: AZURE_STORAGE_CONNECTION_STRING
69-
name: blobs-testtest
7070
image: test.test/image:test3
7171
imagePullPolicy: IfNotPresent
7272
terminationMessagePolicy: File

‎internal/controller/test_data/wfs/complete/input/wfs.yaml‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,36 @@ spec:
2828
minReplicas: 1
2929
options: {}
3030
podSpecPatch:
31+
initContainers:
32+
- name: blob-download
33+
envFrom:
34+
- configMapRef:
35+
name: blobs-testtest
36+
- secretRef:
37+
name: blobs-testtest
38+
- name: mapfile-generator
39+
envFrom:
40+
- configMapRef:
41+
name: postgres-testtest
42+
- secretRef:
43+
name: postgres-testtest
3144
containers:
32-
- name: mapserver
33-
resources:
34-
limits:
35-
cpu: "2"
36-
ephemeral-storage: 11G
37-
memory: 500M
38-
requests:
39-
cpu: "1"
40-
ephemeral-storage: 11G
41-
memory: 250M
45+
- name: mapserver
46+
env:
47+
- name: AZURE_STORAGE_CONNECTION_STRING
48+
valueFrom:
49+
secretKeyRef:
50+
key: AZURE_STORAGE_CONNECTION_STRING
51+
name: blobs-testtest
52+
resources:
53+
limits:
54+
cpu: "2"
55+
ephemeral-storage: 11G
56+
memory: 500M
57+
requests:
58+
cpu: "1"
59+
ephemeral-storage: 11G
60+
memory: 250M
4261
service:
4362
abstract: some "Service" abstract
4463
accessConstraints: http://creativecommons.org/publicdomain/zero/1.0/deed.nl

‎internal/controller/test_data/wfs/minimal/expected/deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ spec:
5252
spec:
5353
containers:
5454
- env:
55+
- name: AZURE_STORAGE_CONNECTION_STRING
56+
valueFrom:
57+
secretKeyRef:
58+
key: AZURE_STORAGE_CONNECTION_STRING
59+
name: blobs-testtest
5560
- name: SERVICE_TYPE
5661
value: WFS
5762
- name: MAPSERVER_CONFIG_FILE
5863
value: "/srv/mapserver/config/default_mapserver.conf"
5964
- name: MS_MAPFILE
6065
value: /srv/data/config/mapfile/service.map
61-
- name: AZURE_STORAGE_CONNECTION_STRING
62-
valueFrom:
63-
secretKeyRef:
64-
key: AZURE_STORAGE_CONNECTION_STRING
65-
name: blobs-testtest
6666
image: test.test/image:test3
6767
imagePullPolicy: IfNotPresent
6868
terminationMessagePath: /dev/termination-log

‎internal/controller/test_data/wfs/minimal/input/wfs.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,21 @@ metadata:
1111
spec:
1212
options: {}
1313
podSpecPatch:
14+
initContainers:
15+
- name: blob-download
16+
envFrom:
17+
- configMapRef:
18+
name: blobs-testtest
19+
- secretRef:
20+
name: blobs-testtest
1421
containers:
1522
- name: mapserver
23+
env:
24+
- name: AZURE_STORAGE_CONNECTION_STRING
25+
valueFrom:
26+
secretKeyRef:
27+
key: AZURE_STORAGE_CONNECTION_STRING
28+
name: blobs-testtest
1629
resources:
1730
limits:
1831
ephemeral-storage: 100M

‎internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ spec:
5252
spec:
5353
containers:
5454
- env:
55+
- name: AZURE_STORAGE_CONNECTION_STRING
56+
valueFrom:
57+
secretKeyRef:
58+
key: AZURE_STORAGE_CONNECTION_STRING
59+
name: blobs-testtest
5560
- name: SERVICE_TYPE
5661
value: WFS
5762
- name: MAPSERVER_CONFIG_FILE
5863
value: "/srv/mapserver/config/default_mapserver.conf"
5964
- name: MS_MAPFILE
6065
value: /srv/data/config/mapfile/service.map
61-
- name: AZURE_STORAGE_CONNECTION_STRING
62-
valueFrom:
63-
secretKeyRef:
64-
key: AZURE_STORAGE_CONNECTION_STRING
65-
name: blobs-testtest
6666
image: test.test/image:test3
6767
imagePullPolicy: IfNotPresent
6868
terminationMessagePath: /dev/termination-log

0 commit comments

Comments
 (0)