Skip to content

CNTRLPLANE-3611: propagate tls profile to aws-pod-identity-webhook #8713

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

Open
ricardomaraschini wants to merge 2 commits into
base: main
Choose a base branch
from
Open

CNTRLPLANE-3611: propagate tls profile to aws-pod-identity-webhook #8713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d4ac2e
feat: propagate tls profile to aws-pod-identity-webhook
ricardomaraschini Jun 10, 2026
d0083c9
feat: propagate tls profile to azure-workload-identity-webhook
ricardomaraschini Jun 16, 2026
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
2 changes: 2 additions & 0 deletions ...e-apiserver/AROSwift/zz_fixture_TestControlPlaneComponents_kube_apiserver_deployment.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...TechPreviewNoUpgrade/zz_fixture_TestControlPlaneComponents_kube_apiserver_deployment.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...tdata/kube-apiserver/zz_fixture_TestControlPlaneComponents_kube_apiserver_deployment.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

241 changes: 212 additions & 29 deletions ...ne-operator/controllers/hostedcontrolplane/v2/kas/azure_workload_identity_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/manifests"

configv1 "github.com/openshift/api/config/v1"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -36,13 +38,7 @@ func TestApplyAzureWorkloadIdentityWebhookContainer(t *testing.T) {
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
var webhookContainer *corev1.Container
for i := range podSpec.Containers {
if podSpec.Containers[i].Name == "azure-workload-identity-webhook" {
webhookContainer = &podSpec.Containers[i]
break
}
}
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
Expand Down Expand Up @@ -72,13 +68,7 @@ func TestApplyAzureWorkloadIdentityWebhookContainer(t *testing.T) {
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
var webhookContainer *corev1.Container
for i := range podSpec.Containers {
if podSpec.Containers[i].Name == "azure-workload-identity-webhook" {
webhookContainer = &podSpec.Containers[i]
break
}
}
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil())

envMap := make(map[string]string)
Expand Down Expand Up @@ -107,13 +97,7 @@ func TestApplyAzureWorkloadIdentityWebhookContainer(t *testing.T) {
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
var webhookContainer *corev1.Container
for i := range podSpec.Containers {
if podSpec.Containers[i].Name == "azure-workload-identity-webhook" {
webhookContainer = &podSpec.Containers[i]
break
}
}
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil())

g.Expect(webhookContainer.StartupProbe).NotTo(BeNil())
Expand Down Expand Up @@ -164,13 +148,7 @@ func TestApplyAzureWorkloadIdentityWebhookContainer(t *testing.T) {
manifests.AzureWorkloadIdentityWebhookKubeconfig("").Name,
))

var webhookContainer *corev1.Container
for i := range podSpec.Containers {
if podSpec.Containers[i].Name == "azure-workload-identity-webhook" {
webhookContainer = &podSpec.Containers[i]
break
}
}
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil())

mountPaths := make(map[string]string)
Expand All @@ -181,13 +159,218 @@ func TestApplyAzureWorkloadIdentityWebhookContainer(t *testing.T) {
g.Expect(mountPaths).To(HaveKeyWithValue(azureWorkloadIdentityWebhookKubeconfigVolumeName, "/var/run/app/kubeconfig"))
},
},
{
name: "Azure workload identity container start script has the kubernetes api server port set",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`https://localhost:6443/version`))
},
},
{
name: "Azure workload identity container start script has tls flags by default",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-min-version=VersionTLS12`))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-cipher-suites=`))
},
},
{
name: "When using intermediate TLS profile it should have the correct tls flags",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
Configuration: &hyperv1.ClusterConfiguration{
APIServer: &configv1.APIServerSpec{
TLSSecurityProfile: &configv1.TLSSecurityProfile{
Type: configv1.TLSProfileIntermediateType,
},
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-min-version=VersionTLS12`))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-cipher-suites=`))
},
},
{
name: "When using old TLS profile it should have the correct tls flags",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
Configuration: &hyperv1.ClusterConfiguration{
APIServer: &configv1.APIServerSpec{
TLSSecurityProfile: &configv1.TLSSecurityProfile{
Type: configv1.TLSProfileOldType,
},
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-min-version=VersionTLS10`))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-cipher-suites=`))
},
},
{
name: "When using modern TLS profile it should have the correct tls flags",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
Configuration: &hyperv1.ClusterConfiguration{
APIServer: &configv1.APIServerSpec{
TLSSecurityProfile: &configv1.TLSSecurityProfile{
Type: configv1.TLSProfileModernType,
},
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-min-version=VersionTLS13`))
g.Expect(webhookContainer.Args[0]).NotTo(ContainSubstring(`--tls-cipher-suites=`))
},
},
{
name: "When using custom TLS profile it should have the correct tls flags",
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "test-hcp",
Namespace: "test-ns",
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
TenantID: "test-tenant-id",
Cloud: "AzurePublicCloud",
},
},
Configuration: &hyperv1.ClusterConfiguration{
APIServer: &configv1.APIServerSpec{
TLSSecurityProfile: &configv1.TLSSecurityProfile{
Type: configv1.TLSProfileCustomType,
Custom: &configv1.CustomTLSProfile{
TLSProfileSpec: configv1.TLSProfileSpec{
MinTLSVersion: configv1.VersionTLS11,
Ciphers: []string{
"ECDHE-ECDSA-AES128-GCM-SHA256",
"ECDHE-RSA-AES128-GCM-SHA256",
},
},
},
},
},
},
},
},
validatePod: func(g *GomegaWithT, podSpec *corev1.PodSpec) {
webhookContainer := findContainerByNameInPod(podSpec, "azure-workload-identity-webhook")
g.Expect(webhookContainer).NotTo(BeNil(), "webhook container should exist")

g.Expect(webhookContainer.Image).To(Equal("azure-workload-identity-webhook"))
g.Expect(webhookContainer.Command).To(Equal([]string{"/bin/sh", "-ec"}))
g.Expect(webhookContainer.Args).To(HaveLen(1))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-min-version=VersionTLS11`))
g.Expect(webhookContainer.Args[0]).To(ContainSubstring(`--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256`))
},
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
g := NewWithT(t)
podSpec := &corev1.PodSpec{}
applyAzureWorkloadIdentityWebhookContainer(podSpec, tc.hcp)
err := applyAzureWorkloadIdentityWebhookContainer(podSpec, tc.hcp)
g.Expect(err).To(BeNil())
tc.validatePod(g, podSpec)
})
}
Expand Down
Loading