Skip to content

Commit c7a2337

Browse files
committed
revert dockerfile and add workaround
1 parent 55a0fbc commit c7a2337

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/services/gcp/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ENV GO111MODULE=off
1212
RUN dep ensure
1313
RUN ./tmp/build/build.sh
1414

15-
FROM alpine:3.19
16-
ENV CLOUD_SDK_VERSION 483.0.0
15+
FROM alpine:3.7
16+
ENV CLOUD_SDK_VERSION 408.0.0
1717

1818
ENV PATH /google-cloud-sdk/bin:$PATH
1919

src/services/gcp/pkg/stub/handler.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,10 @@ func getExactClusterVersion(cr *v1alpha1.GKECluster, log *logrus.Entry) (string,
736736
}
737737

738738
for _, c := range config.Channels {
739+
if strings.ToLower(c.Channel) == "extended" {
740+
// extended in not supported by --release-channel extended in current gcloud version
741+
continue
742+
}
739743
for _, v := range c.ValidVersions {
740744
if strings.HasPrefix(v, cr.Spec.ClusterVersion) {
741745
return v, strings.ToLower(c.Channel), nil

0 commit comments

Comments
 (0)