Skip to content

openshift/install: Update path and binary name for openshift-install. #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yifan-gu wants to merge 1 commit into from
Closed

openshift/install: Update path and binary name for openshift-install. #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ci-operator/config/openshift/installer/master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
}
}
Expand Down Expand Up @@ -59,4 +59,4 @@
"limits": { "cpu": "7", "memory": "9Gi" }
}
}
}
}
6 changes: 3 additions & 3 deletions cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand 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
}

Expand Down
8 changes: 4 additions & 4 deletions cluster/test-deploy/aws/openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -257,15 +257,15 @@ 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.
#
# - "canal": enables overlay networking including network policy. Overlay is implemented by flannel using VXLAN. Network policy is implemented by Calico.
#
# - "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:
Expand Down