Skip to content

Changes required for 4.1.0-rc3 #523

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

Merged
russellb merged 3 commits into from
May 16, 2019
Merged

Changes required for 4.1.0-rc3 #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
122ad84
Pin release image to 4.1.0-rc3
stbenjam May 9, 2019
0de1207
Additional fixes for RC.3
stbenjam May 13, 2019
5782dcc
Pin to custom KNI release
stbenjam May 16, 2019
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
4 changes: 1 addition & 3 deletions assets/templates/99_registry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ spec:
write:
maxWaitInQueue: 0s
storage:
filesystem:
volumeSource:
emptyDir: {}
emptyDir: {}
2 changes: 1 addition & 1 deletion ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export EXTERNAL_SUBNET="192.168.111.0/24"
# The release we default to here is pinned and known to work with our current
# version of kni-installer.
#
export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="registry.svc.ci.openshift.org/ocp/release:4.0.0-0.ci-2019-04-17-133604"
export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="registry.svc.ci.openshift.org/kni/release:4.1.0-rc.3-kni.0"

function generate_ocp_install_config() {
local outdir
Expand Down
4 changes: 2 additions & 2 deletions utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function patch_ep_host_etcd() {
declare -r domain="$1"
declare -r srv_record="_etcd-server-ssl._tcp.$domain"
declare -r api_domain="api.$domain"
host_etcd_ep=$(oc get ep -n kube-system host-etcd -o json | jq -r '{"subsets": .subsets}')
host_etcd_ep=$(oc get ep -n openshift-etcd host-etcd -o json | jq -r '{"subsets": .subsets}')
echo -n "Looking for etcd records"
while ! host -t SRV "$srv_record" "$api_domain" >/dev/null 2>&1; do
echo -n "."
Expand Down Expand Up @@ -245,7 +245,7 @@ patch['subsets'][0]['addresses'] = addresses
print(yaml.safe_dump(patch))
EOF
)" "$host_etcd_ep" "${etcd_hosts[@]}")
oc -n kube-system patch ep/host-etcd --patch "$patch"
oc -n openshift-etcd patch ep/host-etcd --patch "$patch"
}

function sync_repo_and_patch {
Expand Down