- add ignition manifest generation image based on openshift version
@@ -52,6 +52,7 @@ type Config struct {
ImageBuilderCmd string `envconfig:"IMAGE_BUILDER_CMD" default:"echo hello"`
AgentDockerImg string `envconfig:"AGENT_DOCKER_IMAGE" default:"quay.io/oamizur/agent:latest"`
KubeconfigGenerator string `envconfig:"KUBECONFIG_GENERATE_IMAGE" default:"quay.io/ocpmetal/ignition-manifests-and-kubeconfig-generate:stable"`
+ KubeconfigGenerator4_4 string `envconfig:"KUBECONFIG_GENERATE_IMAGE" default:"quay.io/oscohen/ignition-manifests-and-kubeconfig-generate"`
InventoryURL string `envconfig:"INVENTORY_URL" default:"10.35.59.36"`
InventoryPort string `envconfig:"INVENTORY_PORT" default:"30485"`
S3EndpointURL string `envconfig:"S3_ENDPOINT_URL" default:"http://10.35.59.36:30925"`
@@ -756,6 +757,10 @@ func (b *bareMetalInventory) createKubeconfigJob(cluster *models.Cluster, jobNam
if cluster.OpenshiftVersion == models.ClusterOpenshiftVersionNr44 {
overrideImageName = "quay.io/openshift-release-dev/ocp-release:4.4.0-rc.7-x86_64"
}
+ kubeConfigGeneratorImage := b.Config.KubeconfigGenerator
+ if cluster.OpenshiftVersion == models.ClusterOpenshiftVersionNr44 {
+ kubeConfigGeneratorImage = b.Config.KubeconfigGenerator4_4
+ }
return &batch.Job{
TypeMeta: meta.TypeMeta{
Kind: "Job",
@@ -776,7 +781,7 @@ func (b *bareMetalInventory) createKubeconfigJob(cluster *models.Cluster, jobNam
Containers: []core.Container{
{
Name: kubeconfigPrefix,
- Image: b.Config.KubeconfigGenerator,
+ Image: kubeConfigGeneratorImage,
Command: b.imageBuildCmd,
ImagePullPolicy: "IfNotPresent",
Env: []core.EnvVar{
