Skip to content

Commit

Permalink
chore: bump client version and specify client cert/key file paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Meissner committed Apr 12, 2024
1 parent 97efab9 commit 58cbac0
Show file tree
Hide file tree
Showing 148 changed files with 170 additions and 154 deletions.
2 changes: 1 addition & 1 deletion parts/linux/cloud-init/artifacts/cse_config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
6 changes: 5 additions & 1 deletion parts/linux/cloud-init/artifacts/secure-tls-bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -uxo pipefail

DEFAULT_CLIENT_VERSION="client-v0.1.0-alpha.3"
DEFAULT_CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
EVENTS_LOGGING_DIR=/var/log/azure/Microsoft.Azure.Extensions.CustomScript/events/
NEXT_PROTO_VALUE="aks-tls-bootstrap"

Expand All @@ -12,6 +12,8 @@ RETRY_WAIT_SECONDS=5
CLIENT_BINARY_DOWNLOAD_URL="${CLIENT_BINARY_DOWNLOAD_URL:-https://k8sreleases.blob.core.windows.net/aks-tls-bootstrap-client/${DEFAULT_CLIENT_VERSION}/linux/amd64/tls-bootstrap-client}"
CLIENT_BINARY_PATH="${CLIENT_BINARY_PATH:-/opt/azure/tlsbootstrap/tls-bootstrap-client}"
KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}"
CLIENT_CERT_PATH="${CLIENT_CERT_PATH:-/etc/kubernetes/certs/client.crt}"
CLIENT_KEY_PATH="${CLIENT_KEY_PATH:-/etc/kubernetes/certs/client.key}"
API_SERVER_NAME="${API_SERVER_NAME:-""}"
AZURE_CONFIG_PATH="${AZURE_CONFIG_PATH:-/etc/kubernetes/azure.json}"
CLUSTER_CA_FILE_PATH="${CLUSTER_CA_FILE_PATH:-/etc/kubernetes/certs/ca.crt}"
Expand Down Expand Up @@ -95,6 +97,8 @@ bootstrap() {
--apiserver-fqdn="$API_SERVER_NAME" \
--cluster-ca-file="$CLUSTER_CA_FILE_PATH" \
--azure-config="$AZURE_CONFIG_PATH" \
--cert-file="$CLIENT_CERT_PATH" \
--key-file="$CLIENT_KEY_PATH" \
--next-proto="$NEXT_PROTO_VALUE" \
--kubeconfig="$KUBECONFIG_PATH"

Expand Down
2 changes: 1 addition & 1 deletion parts/linux/cloud-init/nodecustomdata.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ write_files:
owner: root
content: |
[Service]
Environment="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/client-v0.1.0-alpha.3/linux/amd64/tls-bootstrap-client"
Environment="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/client-v0.1.0-alpha.cameissner0/linux/amd64/tls-bootstrap-client"
Environment="API_SERVER_NAME={{GetKubernetesEndpoint}}"
{{if GetCustomSecureTLSBootstrapAADResource -}}
Environment="AAD_RESOURCE={{GetCustomSecureTLSBootstrapAADResource}}"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ ensureKubeCAFile() {
}

configureSecureTLSBootstrap() {
CLIENT_VERSION="client-v0.1.0-alpha.3"
CLIENT_VERSION="client-v0.1.0-alpha.cameissner0"
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/amd64/tls-bootstrap-client"
if [[ $(isARM64) == 1 ]]; then
DOWNLOAD_URL="https://kubernetesreleases.blob.core.windows.net/aks-tls-bootstrap-client/${CLIENT_VERSION}/linux/arm64/tls-bootstrap-client"
Expand Down
Loading

0 comments on commit 58cbac0

Please sign in to comment.