Skip to content

Commit afe0a0e

Browse files
saewonisaewoni
committed
update mode from pointer to nonpointer
1 parent 4dce2e5 commit afe0a0e

File tree

15 files changed

+112
-124
lines changed

15 files changed

+112
-124
lines changed

‎pkg/apis/v1alpha2/aksnodeclass.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const (
126126
type LocalDNS struct {
127127
// Mode of enablement for localDNS.
128128
// +required
129-
Mode *LocalDNSMode `json:"mode"`
129+
Mode LocalDNSMode `json:"mode"`
130130
// VnetDNS overrides apply to DNS traffic from pods with dnsPolicy:default or kubelet (referred to as VnetDNS traffic).
131131
// +required
132132
VnetDNSOverrides map[string]*LocalDNSOverrides `json:"vnetDNSOverrides"`
@@ -362,11 +362,11 @@ func (in *AKSNodeClass) GetEncryptionAtHost() bool {
362362
// Returns true for Required mode, false for Disabled mode, and for Preferred mode,
363363
// returns true only if the Kubernetes version is >= 1.36.
364364
func (in *AKSNodeClass) IsLocalDNSEnabled() bool {
365-
if in.Spec.LocalDNS == nil || in.Spec.LocalDNS.Mode == nil {
365+
if in.Spec.LocalDNS == nil || in.Spec.LocalDNS.Mode == "" {
366366
return false
367367
}
368368

369-
switch *in.Spec.LocalDNS.Mode {
369+
switch in.Spec.LocalDNS.Mode {
370370
case LocalDNSModeRequired:
371371
return true
372372
case LocalDNSModeDisabled:

‎pkg/apis/v1alpha2/aksnodeclass_hash_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var _ = Describe("Hash", func() {
7474
Entry("ImageFamily", "15616969746300892810", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{ImageFamily: lo.ToPtr("AzureLinux")}}),
7575
Entry("Kubelet", "33638514539106194", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{Kubelet: &v1alpha2.KubeletConfiguration{CPUManagerPolicy: "none"}}}),
7676
Entry("MaxPods", "15508761509963240710", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{MaxPods: lo.ToPtr(int32(200))}}),
77-
Entry("LocalDNS.Mode", "17805442572569734619", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{Mode: lo.ToPtr(v1alpha2.LocalDNSModeRequired)}}}),
77+
Entry("LocalDNS.Mode", "17805442572569734619", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{Mode: v1alpha2.LocalDNSModeRequired}}}),
7878
Entry("LocalDNS.VnetDNSOverrides", "1846993897639680515", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{VnetDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {QueryLogging: lo.ToPtr(v1alpha2.LocalDNSQueryLoggingLog)}}}}}),
7979
Entry("LocalDNS.KubeDNSOverrides", "1649149597266483112", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{KubeDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {Protocol: lo.ToPtr(v1alpha2.LocalDNSProtocolForceTCP)}}}}}),
8080
Entry("LocalDNS.VnetDNSOverrides.CacheDuration", "11176862737221572952", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{VnetDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {CacheDuration: karpv1.MustParseNillableDuration("1h")}}}}}),
@@ -95,7 +95,7 @@ var _ = Describe("Hash", func() {
9595
Entry("ImageFamily", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{ImageFamily: lo.ToPtr("AzureLinux")}}),
9696
Entry("Kubelet", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{Kubelet: &v1alpha2.KubeletConfiguration{CPUManagerPolicy: "none"}}}),
9797
Entry("MaxPods", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{MaxPods: lo.ToPtr(int32(200))}}),
98-
Entry("LocalDNS.Mode", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{Mode: lo.ToPtr(v1alpha2.LocalDNSModeRequired)}}}),
98+
Entry("LocalDNS.Mode", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{Mode: v1alpha2.LocalDNSModeRequired}}}),
9999
Entry("LocalDNS.VnetDNSOverrides", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{VnetDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {QueryLogging: lo.ToPtr(v1alpha2.LocalDNSQueryLoggingLog)}}}}}),
100100
Entry("LocalDNS.KubeDNSOverrides", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{KubeDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {Protocol: lo.ToPtr(v1alpha2.LocalDNSProtocolForceTCP)}}}}}),
101101
Entry("LocalDNS.VnetDNSOverrides.CacheDuration", v1alpha2.AKSNodeClass{Spec: v1alpha2.AKSNodeClassSpec{LocalDNS: &v1alpha2.LocalDNS{VnetDNSOverrides: map[string]*v1alpha2.LocalDNSOverrides{"example.com": {CacheDuration: karpv1.MustParseNillableDuration("2h")}}}}}),

‎pkg/apis/v1alpha2/crd_validation_cel_test.go‎

Lines changed: 35 additions & 35 deletions
Large diffs are not rendered by default.

‎pkg/apis/v1alpha2/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/v1beta1/aksnodeclass.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const (
127127
type LocalDNS struct {
128128
// Mode of enablement for localDNS.
129129
// +required
130-
Mode *LocalDNSMode `json:"mode"`
130+
Mode LocalDNSMode `json:"mode"`
131131
// VnetDNS overrides apply to DNS traffic from pods with dnsPolicy:default or kubelet (referred to as VnetDNS traffic).
132132
// +required
133133
VnetDNSOverrides map[string]*LocalDNSOverrides `json:"vnetDNSOverrides"`
@@ -363,11 +363,11 @@ func (in *AKSNodeClass) GetEncryptionAtHost() bool {
363363
// Returns true for Required mode, false for Disabled mode, and for Preferred mode,
364364
// returns true only if the Kubernetes version is >= 1.36.
365365
func (in *AKSNodeClass) IsLocalDNSEnabled() bool {
366-
if in.Spec.LocalDNS == nil || in.Spec.LocalDNS.Mode == nil {
366+
if in.Spec.LocalDNS == nil || in.Spec.LocalDNS.Mode == "" {
367367
return false
368368
}
369369

370-
switch *in.Spec.LocalDNS.Mode {
370+
switch in.Spec.LocalDNS.Mode {
371371
case LocalDNSModeRequired:
372372
return true
373373
case LocalDNSModeDisabled:

‎pkg/apis/v1beta1/aksnodeclass_hash_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ var _ = Describe("Hash", func() {
7474
Entry("ImageFamily", "15616969746300892810", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{ImageFamily: lo.ToPtr("AzureLinux")}}),
7575
Entry("Kubelet", "33638514539106194", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{Kubelet: &v1beta1.KubeletConfiguration{CPUManagerPolicy: "none"}}}),
7676
Entry("MaxPods", "15508761509963240710", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{MaxPods: lo.ToPtr(int32(200))}}),
77-
Entry("LocalDNS.Mode", "17805442572569734619", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{Mode: lo.ToPtr(v1beta1.LocalDNSModeRequired)}}}),
77+
Entry("LocalDNS.Mode", "17805442572569734619", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{Mode: v1beta1.LocalDNSModeRequired}}}),
7878
Entry("LocalDNS.VnetDNSOverrides", "1846993897639680515", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{VnetDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {QueryLogging: lo.ToPtr(v1beta1.LocalDNSQueryLoggingLog)}}}}}),
7979
Entry("LocalDNS.KubeDNSOverrides", "1649149597266483112", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{KubeDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {Protocol: lo.ToPtr(v1beta1.LocalDNSProtocolForceTCP)}}}}}),
8080
Entry("LocalDNS.VnetDNSOverrides.CacheDuration", "11176862737221572952", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{VnetDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {CacheDuration: karpv1.MustParseNillableDuration("1h")}}}}}),
@@ -92,7 +92,7 @@ var _ = Describe("Hash", func() {
9292
Entry("ImageFamily", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{ImageFamily: lo.ToPtr("AzureLinux")}}),
9393
Entry("Kubelet", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{Kubelet: &v1beta1.KubeletConfiguration{CPUManagerPolicy: "none"}}}),
9494
Entry("MaxPods", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{MaxPods: lo.ToPtr(int32(200))}}),
95-
Entry("LocalDNS.Mode", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{Mode: lo.ToPtr(v1beta1.LocalDNSModeRequired)}}}),
95+
Entry("LocalDNS.Mode", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{Mode: v1beta1.LocalDNSModeRequired}}}),
9696
Entry("LocalDNS.VnetDNSOverrides", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{VnetDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {QueryLogging: lo.ToPtr(v1beta1.LocalDNSQueryLoggingLog)}}}}}),
9797
Entry("LocalDNS.KubeDNSOverrides", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{KubeDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {Protocol: lo.ToPtr(v1beta1.LocalDNSProtocolForceTCP)}}}}}),
9898
Entry("LocalDNS.VnetDNSOverrides.CacheDuration", v1beta1.AKSNodeClass{Spec: v1beta1.AKSNodeClassSpec{LocalDNS: &v1beta1.LocalDNS{VnetDNSOverrides: map[string]*v1beta1.LocalDNSOverrides{"example.com": {CacheDuration: karpv1.MustParseNillableDuration("2h")}}}}}),

0 commit comments

Comments
 (0)