Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions codegen.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,29 @@ ${
def minor = versionParts[1]
def patch = versionParts[2]
def deprecated = version.get("deprecated") ?: false
def customImage = version.get("image") ?: null
def deprecation = deprecated ? "\t@Deprecated\n" : ""
"${deprecation}\tVERSION_${major}_${minor}_${patch}(new KubernetesVersionDescriptor(${major}, ${minor}, ${patch}))"
def imageArg = customImage ? ", \"${customImage}\"" : ", null"
"${deprecation}\tVERSION_${major}_${minor}_${patch}(new KubernetesVersionDescriptor(${major}, ${minor}, ${patch})${imageArg})"
}).join(",\n")
};

private final KubernetesVersionDescriptor descriptor;

private ${enumName}(final KubernetesVersionDescriptor descriptor) {
private final String customImage;

private ${enumName}(final KubernetesVersionDescriptor descriptor, final String customImage) {
this.descriptor = descriptor;
this.customImage = customImage;
}

@Override
public KubernetesVersionDescriptor descriptor() {
return descriptor;
}

@Override
public String defaultImageTemplate() {
return "${defaultImageTemplate}";
return customImage != null ? customImage : "${defaultImageTemplate}";
}

@Override
Expand Down
13 changes: 13 additions & 0 deletions k8s-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
},
{
"k8s": "1.34.0"
},
{
"k8s": "1.35.0"
}
]
},
Expand Down Expand Up @@ -110,6 +113,13 @@
},
{
"k8s": "1.34.1"
},
{
"k8s": "1.34.3"
},
{
"k8s": "1.35.0",
"image": "rancher/k3s:v1.35.0-rc1-k3s1"
}
]
},
Expand Down Expand Up @@ -167,6 +177,9 @@
},
{
"k8s": "1.34.1"
},
{
"k8s": "1.35.0"
}
]
}
Expand Down
Loading