Skip to content
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

feature: update ABM version to 1.13.1 #472

Merged
merged 1 commit into from
Nov 2, 2022
Merged

feature: update ABM version to 1.13.1 #472

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
4 changes: 2 additions & 2 deletions anthos-bm-gcp-bash/install_hybrid_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s ht
chmod +x kubectl
mv kubectl /usr/local/sbin/
mkdir baremetal && cd baremetal
gsutil cp gs://anthos-baremetal-release/bmctl/1.13.0/linux-amd64/bmctl .
gsutil cp gs://anthos-baremetal-release/bmctl/1.13.1/linux-amd64/bmctl .
chmod a+x bmctl
mv bmctl /usr/local/sbin/

Expand Down Expand Up @@ -238,7 +238,7 @@ metadata:
namespace: cluster-\$clusterid
spec:
type: hybrid
anthosBareMetalVersion: 1.13.0
anthosBareMetalVersion: 1.13.1
gkeConnect:
projectID: \$PROJECT_ID
controlPlane:
Expand Down
300 changes: 0 additions & 300 deletions anthos-bm-gcp-bash/setup_and_install_abm.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion anthos-bm-gcp-terraform/resources/init_vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function __setup_kubctl__ () {
##############################################################################
function __setup_bmctl__ () {
mkdir baremetal && cd baremetal || return
gsutil cp gs://anthos-baremetal-release/bmctl/1.12.2/linux-amd64/bmctl .
gsutil cp gs://anthos-baremetal-release/bmctl/1.13.1/linux-amd64/bmctl .
chmod a+x bmctl
mv bmctl /usr/local/sbin/
__check_exit_status__ $? \
Expand Down
2 changes: 1 addition & 1 deletion anthos-bm-gcp-terraform/resources/templates/anthos_gce_cluster.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
namespace: ${clusterId}-ns
spec:
type: hybrid
anthosBareMetalVersion: 1.12.2
anthosBareMetalVersion: 1.13.1
gkeConnect:
projectID: ${projectId}
controlPlane:
Expand Down
2 changes: 1 addition & 1 deletion anthos-bm-gcp-terraform/resources/templates/manuallb_cluster.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
namespace: ${clusterId}-ns
spec:
type: hybrid
anthosBareMetalVersion: 1.12.2
anthosBareMetalVersion: 1.13.1
gkeConnect:
projectID: ${projectId}
controlPlane:
Expand Down
2 changes: 1 addition & 1 deletion anthos-bm-gcp-terraform/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ terraform {
}

provider_meta "google" {
# Anthos Bare metal version used in this release is 1.12.2
# Anthos Bare metal version used in this release is 1.13.1
# See
# - https://github.com/GoogleCloudPlatform/anthos-samples/blob/main/anthos-bm-gcp-terraform/resources/templates/anthos_gce_cluster.tpl#L20
# - https://github.com/GoogleCloudPlatform/anthos-samples/blob/main/anthos-bm-gcp-terraform/resources/init_vm.sh#L180
Expand Down
2 changes: 1 addition & 1 deletion test/integration/abm_gce_defaults_on_editor_project/abm_gce_editor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestABMEditor(t *testing.T) {
assert.NotContains(abmInstall, "[-]", "gce setup for abm installation should not have any failed stages")

bmctl := runSSHCmd(t, projectID, "root@cluster1-abm-ws0-001", "bmctl version")
assert.Contains(bmctl, "bmctl version: 1.12.2", "bmctl version should be 1.12.2")
assert.Contains(bmctl, "bmctl version: 1.13.1", "bmctl version should be 1.13.1")

docker := runSSHCmd(t, projectID, "root@cluster1-abm-ws0-001", "docker version")
dockerExpectedOP := []string{"Client: Docker Engine", "Server: Docker Engine", "API version", "Version", "linux/amd64"}
Expand Down