Skip to content

Commit

Permalink
Merge pull request openshift#1414 from abutcher/default-release-img
Browse files Browse the repository at this point in the history
Update default release image URL.
  • Loading branch information
openshift-merge-robot committed Jun 10, 2021
2 parents ba15b21 + 9af7bbf commit 0cb678d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions contrib/pkg/clusterpool/clusterpool.go
Expand Up @@ -43,7 +43,7 @@ An existing ClusterImageSet can be specified with the --image-set
flag. Otherwise, one will be generated using the image specified for the
cluster pool using --release-image flag. If neither of these flags are
specified, default image is obtained from the following URL:
https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest
https://amd64.ocp.releases.ci.openshift.org/api/v1/releasestream/4-stable/latest
ENVIRONMENT VARIABLES
The command will use the following environment variables for its output:
Expand Down Expand Up @@ -133,7 +133,7 @@ create-pool CLUSTER_POOL_NAME --cloud=gcp`,
flags.StringVar(&opt.CloudSecretName, "cloud-secret", "", "Cloud secret name if already created")
flags.StringVar(&opt.ClusterImageSet, "image-set", "", "Cluster image set to use for this cluster pool")
flags.StringVar(&opt.ReleaseImage, "release-image", "", "Release image to use for installing the clusters in this pool")
flags.StringVar(&opt.ReleaseImageSource, "release-image-source", "https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest", "URL to JSON describing the release image pull spec")
flags.StringVar(&opt.ReleaseImageSource, "release-image-source", "https://amd64.ocp.releases.ci.openshift.org/api/v1/releasestream/4-stable/latest", "URL to JSON describing the release image pull spec")
flags.StringVar(&opt.Region, "region", "", "Region to which to install the cluster pool.")
flags.Int32Var(&opt.Size, "size", 1, "Size of cluster pool")
flags.StringVar(&opt.AzureBaseDomainResourceGroupName, "azure-base-domain-resource-group-name", "os4-common", "Resource group where the azure DNS zone for the base domain is found")
Expand Down
4 changes: 2 additions & 2 deletions contrib/pkg/createcluster/create.go
Expand Up @@ -81,7 +81,7 @@ These are only relevant for creating a cluster on vSphere.
RELEASE_IMAGE - Release image to use to install the cluster. If not specified,
the --release-image flag is used. If that's not specified, a default image is
obtained from a the following URL:
https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest
https://amd64.ocp.releases.ci.openshift.org/api/v1/releasestream/4-stable/latest
`
const (
hiveutilCreatedLabel = "hive.openshift.io/hiveutil-created"
Expand Down Expand Up @@ -258,7 +258,7 @@ create-cluster CLUSTER_DEPLOYMENT_NAME --cloud=ovirt --ovirt-api-vip 192.168.1.2
flags.StringVar(&opt.CredsFile, "creds-file", "", "Cloud credentials file (defaults vary depending on cloud)")
flags.StringVar(&opt.ClusterImageSet, "image-set", "", "Cluster image set to use for this cluster deployment")
flags.StringVar(&opt.ReleaseImage, "release-image", "", "Release image to use for installing this cluster deployment")
flags.StringVar(&opt.ReleaseImageSource, "release-image-source", "https://openshift-release.svc.ci.openshift.org/api/v1/releasestream/4-stable/latest", "URL to JSON describing the release image pull spec")
flags.StringVar(&opt.ReleaseImageSource, "release-image-source", "https://amd64.ocp.releases.ci.openshift.org/api/v1/releasestream/4-stable/latest", "URL to JSON describing the release image pull spec")
flags.StringVar(&opt.ServingCert, "serving-cert", "", "Serving certificate for control plane and routes")
flags.StringVar(&opt.ServingCertKey, "serving-cert-key", "", "Serving certificate key for control plane and routes")
flags.BoolVar(&opt.ManageDNS, "manage-dns", false, "Manage this cluster's DNS. This is only available for AWS and GCP.")
Expand Down

0 comments on commit 0cb678d

Please sign in to comment.