Skip to content

Commit

Permalink
Merge branch 'master' into renovate/containernetworking-azure-cni-1.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Devinwong authored Jan 15, 2025
2 parents 5eb8715 + 2fec2d9 commit d8f0c12
Show file tree
Hide file tree
Showing 177 changed files with 273 additions and 87 deletions.
2 changes: 2 additions & 0 deletions parts/linux/cloud-init/artifacts/cse_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
1 change: 1 addition & 0 deletions pkg/agent/datamodel/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ type KubernetesAddon struct {
// EbpfDataplane controls the eBPF networking dataplane.
type EbpfDataplane int32

//nolint:stylecheck // underscores in constant names are used for clarity in this context
const (
// none means don't install an eBPF dataplane.
EbpfDataplane_none EbpfDataplane = 0
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Docker/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S115/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S117/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+K8S118/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line70.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ getPrimaryNicIP() {
}

generateSelfSignedKubeletServingCertificate() {
mkdir -p "/etc/kubernetes/certs"

KUBELET_SERVER_PRIVATE_KEY_PATH="/etc/kubernetes/certs/kubeletserver.key"
KUBELET_SERVER_CERT_PATH="/etc/kubernetes/certs/kubeletserver.crt"

Expand Down
Loading

0 comments on commit d8f0c12

Please sign in to comment.