Skip to content

Commit 0040f23

Browse files
DespireCI/CD pipeline
and
CI/CD pipeline
authored
fix proxy panic with old clusters (#1600)
Co-authored-by: CI/CD pipeline <CI/[email protected]>
1 parent 7d1490a commit 0040f23

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

manifests/claudie/kustomization.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
5757
kind: Kustomization
5858
images:
5959
- name: ghcr.io/berops/claudie/ansibler
60-
newTag: bd26f53-3179
60+
newTag: 06cb96b-3180
6161
- name: ghcr.io/berops/claudie/autoscaler-adapter
62-
newTag: f95dd2b-3176
62+
newTag: 06cb96b-3180
6363
- name: ghcr.io/berops/claudie/builder
64-
newTag: f95dd2b-3176
64+
newTag: 06cb96b-3180
6565
- name: ghcr.io/berops/claudie/claudie-operator
66-
newTag: f95dd2b-3176
66+
newTag: 06cb96b-3180
6767
- name: ghcr.io/berops/claudie/kube-eleven
68-
newTag: bd26f53-3179
68+
newTag: 06cb96b-3180
6969
- name: ghcr.io/berops/claudie/kuber
70-
newTag: f95dd2b-3176
70+
newTag: 06cb96b-3180
7171
- name: ghcr.io/berops/claudie/manager
72-
newTag: f95dd2b-3176
72+
newTag: 06cb96b-3180
7373
- name: ghcr.io/berops/claudie/terraformer
74-
newTag: f95dd2b-3176
74+
newTag: 06cb96b-3180

manifests/testing-framework/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ secretGenerator:
9191

9292
images:
9393
- name: ghcr.io/berops/claudie/testing-framework
94-
newTag: f95dd2b-3176
94+
newTag: 06cb96b-3180

services/builder/internal/builder_context.go

+9
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,15 @@ func (ctx *Context) DetermineProxyUpdate() bool {
106106
hetznerInDesired := HasHetznerNode(ctx.DesiredCluster.ClusterInfo)
107107
hetznerInCurrent := HasHetznerNode(ctx.CurrentCluster.ClusterInfo)
108108

109+
// For clusters build before the changes to the proxy setting
110+
// the InstallationProxy field will be nil, to avoid panic
111+
// we set it to the default mode.
112+
// TODO: in future releases, remove this.
113+
if ctx.CurrentCluster.InstallationProxy == nil {
114+
ctx.CurrentCluster.InstallationProxy = &spec.InstallationProxy{
115+
Mode: "default",
116+
}
117+
}
109118
currProxySettings := ctx.CurrentCluster.InstallationProxy
110119
desiredProxySettings := ctx.DesiredCluster.InstallationProxy
111120

0 commit comments

Comments
 (0)