Skip to content

Commit

Permalink
custom images
Browse files Browse the repository at this point in the history
Signed-off-by: Patryk Diak <pdiak@redhat.com>
  • Loading branch information
kyrtapz committed Sep 13, 2023
1 parent 93d7c90 commit e36760e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pkg/network/network_identity.go
Expand Up @@ -90,7 +90,9 @@ func renderNetworkIdentity(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.
data.Data["TokenAudience"] = os.Getenv("TOKEN_AUDIENCE")
data.Data["HCPNodeSelector"] = bootstrapResult.Infra.HostedControlPlane.Spec.NodeSelector
data.Data["NetworkIdentityImage"] = hcpCfg.ControlPlaneImage // OVN_CONTROL_PLANE_IMAGE

// TODO: REMOVE ME START
data.Data["NetworkIdentityImage"] = "quay.io/pdiak/ovn-kubernetes:cert_manager_downstream"
// TODO: REMOVE ME END
localAPIServer := bootstrapResult.Infra.APIServers[bootstrap.APIServerDefaultLocal]
data.Data["K8S_LOCAL_APISERVER"] = "https://" + net.JoinHostPort(localAPIServer.Host, localAPIServer.Port)

Expand All @@ -115,6 +117,9 @@ func renderNetworkIdentity(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.
} else {
// self-hosted specific
data.Data["NetworkIdentityImage"] = os.Getenv("OVN_IMAGE")
// TODO: REMOVE ME START
data.Data["NetworkIdentityImage"] = "quay.io/pdiak/ovn-kubernetes:cert_manager_downstream"
// TODO: REMOVE ME END

// NetworkIdentityTerminationDurationSeconds holds the allowed termination duration
// During node reboot, the webhook has to wait for the API server to terminate first to avoid disruptions
Expand Down
4 changes: 4 additions & 0 deletions pkg/network/ovn_kubernetes.go
Expand Up @@ -124,6 +124,10 @@ func renderOVNKubernetes(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Bo
if bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.Enabled {
data.Data["OvnControlPlaneImage"] = bootstrapResult.OVN.OVNKubernetesConfig.HyperShiftConfig.ControlPlaneImage
}
// TODO: REMOVE ME START
data.Data["OvnImage"] = "quay.io/pdiak/ovn-kubernetes:cert_manager_downstream"
data.Data["OvnControlPlaneImage"] = "quay.io/pdiak/ovn-kubernetes:cert_manager_downstream"
// TODO: REMOVE ME END
data.Data["OvnkubeMasterReplicas"] = len(bootstrapResult.OVN.MasterAddresses)
data.Data["KubeRBACProxyImage"] = os.Getenv("KUBE_RBAC_PROXY_IMAGE")
data.Data["Socks5ProxyImage"] = os.Getenv("SOCKS5_PROXY_IMAGE")
Expand Down

0 comments on commit e36760e

Please sign in to comment.