Skip to content

Commit be5d20f

Browse files
committed
fix: installation fail on k8s 1.30+
1 parent 51408a8 commit be5d20f

3 files changed

Lines changed: 33 additions & 11 deletions

File tree

stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ spec:
7575
value: "{{ trimSuffix "-jvm" .Values.operator.image.tag }}"
7676
- name: DISABLE_RECONCILIATION
7777
value: "false"
78+
79+
# Remove after version 1.13 get out of support
80+
- name: INSTALL_CONFIG
81+
value: "true"
82+
- name: SGCONFIG
83+
value: |
84+
apiVersion: stackgres.io/v1
85+
kind: SGConfig
86+
metadata:
87+
name: {{ .Release.Name }}
88+
namespace: {{ .Values.sgConfigNamespace | default .Release.Namespace }}
89+
spec:
90+
{{- $spec := dict }}
91+
{{- range .Values.specFields }}
92+
{{- $spec := set $spec . (index $.Values .) }}
93+
{{- end }}
94+
{{ regexReplaceAll "[^ ]+: null" (toYaml $spec | nindent 16) "" }}
95+
7896
- name: INSTALL_CRDS
7997
value: "{{ if or .Values.disableClusterRole .Values.disableCrdsAndWebhooksUpdate }}false{{ else }}true{{ end }}"
8098
- name: WAIT_CRDS_UPGRADE

stackgres-k8s/install/helm/stackgres-operator/templates/sgconfig.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ data:
2626
apiVersion: stackgres.io/v1
2727
kind: SGConfig
2828
metadata:
29-
annotations:
30-
meta.helm.sh/release-name: {{ .Release.Name }}
31-
meta.helm.sh/release-namespace: {{ .Release.Namespace }}
32-
labels:
33-
app.kubernetes.io/managed-by: Helm
3429
name: {{ .Release.Name }}
3530
namespace: {{ .Values.sgConfigNamespace | default .Release.Namespace }}
3631
spec:
@@ -91,7 +86,21 @@ spec:
9186
- "-ecx"
9287
- |
9388
kubectl replace -f /SGConfig.yaml
94-
kubectl apply -f /sgconfig.yaml
89+
RETRY=10
90+
while true
91+
do
92+
if kubectl apply -f /sgconfig.yaml
93+
then
94+
break
95+
else
96+
if [ "$RETRY" -le 0 ]
97+
then
98+
exit 1
99+
fi
100+
RETRY="$((RETRY - 1))"
101+
sleep 2
102+
fi
103+
done
95104
volumeMounts:
96105
- name: sgconfig-crd
97106
mountPath: /SGConfig.yaml

stackgres-k8s/install/helm/stackgres-operator/values.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,11 +546,6 @@ developer:
546546
# -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core
547547
volumeMounts: []
548548
# Section to define volumes to be used by the distributedlogs controller container
549-
distributedlogsController:
550-
# -- Pod volumes. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volume-v1-core
551-
volumes: []
552-
# -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core
553-
volumeMounts: []
554549
# -- The list of fields that are serialized into the spec of SGConfig
555550
specFields: [
556551
containerRegistry, imagePullPolicy, imagePullSecrets, allowedNamespaces, allowedNamespaceLabelSelector,

0 commit comments

Comments
 (0)