diff --git a/ci-operator/config/openshift/installer/master.json b/ci-operator/config/openshift/installer/master.json index 5fcca922c3953..38c6889071b73 100644 --- a/ci-operator/config/openshift/installer/master.json +++ b/ci-operator/config/openshift/installer/master.json @@ -23,15 +23,15 @@ "canonical_go_repository": "github.com/openshift/installer", - "binary_build_commands": "go build ./installer/cmd/tectonic", + "binary_build_commands": "go build ./installer/cmd/openshift-install", "images": [ { "from": "base", "to": "installer", - "dockerfile_path": "images/tectonic-installer/Dockerfile.ci", + "dockerfile_path": "images/openshift-installer/Dockerfile.ci", "inputs": { - "bin": {"paths": [{"source_path": "/go/src/github.com/openshift/installer/tectonic", "destination_dir": "."}]}, + "bin": {"paths": [{"source_path": "/go/src/github.com/openshift/installer/openshift-install", "destination_dir": "."}]}, "root": {"as": ["build"]} } } @@ -59,4 +59,4 @@ "limits": { "cpu": "7", "memory": "9Gi" } } } -} \ No newline at end of file +} diff --git a/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml b/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml index 343097b8fee6a..afd11a3795a04 100644 --- a/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml +++ b/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml @@ -196,12 +196,12 @@ objects: echo "Invoking installer ..." cd /tmp/cluster - tectonic init --config=inputs.yaml + openshift-install init --config=inputs.yaml mv -f ${NAME}/* /tmp/cluster/ mkdir /tmp/artifacts/installer cp inputs.yaml config.yaml internal.yaml terraform.tfvars /tmp/artifacts/installer/ - tectonic install --dir=. --log-level=debug + openshift-install install --dir=. --log-level=debug export KUBECONFIG=$(pwd)/generated/auth/kubeconfig # wait until oc shows up @@ -297,7 +297,7 @@ objects: export AWS_SHARED_CREDENTIALS_FILE=/etc/openshift-installer/.awscred cd /tmp/shared/cluster for i in `seq 1 2`; do - tectonic destroy --dir=. --log-level=debug + openshift-install destroy --dir=. --log-level=debug done } diff --git a/cluster/test-deploy/aws/openshift.yaml b/cluster/test-deploy/aws/openshift.yaml index a1f3c832cd1ad..361006f4a6401 100644 --- a/cluster/test-deploy/aws/openshift.yaml +++ b/cluster/test-deploy/aws/openshift.yaml @@ -3,7 +3,7 @@ admin: password: "${PASSWORD}" aws: # (optional) Unique name under which the Amazon S3 bucket will be created. Bucket name must start with a lower case name and is limited to 63 characters. - # The Tectonic Installer uses the bucket to store tectonic assets and kubeconfig. + # The OpenShift Installer uses the bucket to store tectonic assets and kubeconfig. # If name is not provided the installer will construct the name using "name", current AWS region and "baseDomain" # assetsS3BucketName: @@ -75,7 +75,7 @@ aws: # Example: `{ "key" = "value", "foo" = "bar" }` # extraTags: - # (optional) Name of IAM role to use to access AWS in order to deploy the Tectonic Cluster. + # (optional) Name of IAM role to use to access AWS in order to deploy the OpenShift Cluster. # The name is also the full role's ARN. # # Example: @@ -257,7 +257,7 @@ networking: # The maximum size of this IP range is /12 serviceCIDR: 10.3.0.0/16 - # (optional) Configures the network to be used in Tectonic. One of the following values can be used: + # (optional) Configures the network to be used in OpenShift cluster. One of the following values can be used: # # - "flannel": enables overlay networking only. This is implemented by flannel using VXLAN. # @@ -265,7 +265,7 @@ networking: # # - "calico-ipip": [ALPHA] enables BGP based networking. Routing and network policy is implemented by Calico. Note this has been tested on baremetal installations only. # - # - "none": disables the installation of any Pod level networking layer provided by Tectonic. By setting this value, users are expected to deploy their own solution to enable network connectivity for Pods and Services. + # - "none": disables the installation of any Pod level networking layer provided by OpenShift. By setting this value, users are expected to deploy their own solution to enable network connectivity for Pods and Services. # type: canal nodePools: