Skip to content

Commit 2fb8f9c

Browse files
committed
RELEASE/MINOR: kubernetes-ingress: Tag release 1.34.1
Changes in kubernetes-ingress: - Fixes for .Capabilities.APIVersions issues (issues #202 and #211) - semverCompare fixes for appProtocol Signed-off-by: Dinko Korunic <[email protected]>
1 parent 5404ee6 commit 2fb8f9c

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

kubernetes-ingress/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apiVersion: v2
1616
name: kubernetes-ingress
1717
description: A Helm chart for HAProxy Kubernetes Ingress Controller
1818
type: application
19-
version: 1.34.0
19+
version: 1.34.1
2020
appVersion: 1.10.9
2121
kubeVersion: ">=1.22.0-0"
2222
keywords:
@@ -32,5 +32,5 @@ maintainers:
3232
engine: gotpl
3333
annotations:
3434
artifacthub.io/changes: |
35-
- Use Ingress Controller 1.10.9 version for base image
36-
- Set allowPrivilegeEscalation to false by default
35+
- Fixes for .Capabilities.APIVersions issues (issues #202 and #211)
36+
- semverCompare fixes for appProtocol

kubernetes-ingress/templates/controller-hpa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
{{- if and (eq .Values.controller.kind "Deployment") .Values.controller.autoscaling.enabled }}
1818
{{- if not .Values.controller.keda.enabled }}
19-
{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
19+
{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2") (semverCompare ">=1.23.0-0" .Capabilities.KubeVersion.Version) }}
2020
apiVersion: autoscaling/v2
2121
{{- else if .Capabilities.APIVersions.Has "autoscaling/v2beta2" }}
2222
apiVersion: autoscaling/v2beta2

kubernetes-ingress/templates/controller-ingressclass.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/}}
1616

17-
{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass") (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass") }}
18-
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass" }}
17+
{{- if semverCompare ">=1.16.0-0" .Capabilities.KubeVersion.Version }}
18+
{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass") (semverCompare ">=1.19.0-0" .Capabilities.KubeVersion.Version) }}
1919
apiVersion: networking.k8s.io/v1
2020
{{- else }}
2121
apiVersion: networking.k8s.io/v1beta1

kubernetes-ingress/templates/controller-poddisruptionbudget.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/}}
1616

1717
{{- if .Values.controller.PodDisruptionBudget.enable }}
18-
{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }}
18+
{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version) }}
1919
apiVersion: policy/v1
2020
{{- else }}
2121
apiVersion: policy/v1beta1

kubernetes-ingress/templates/controller-podsecuritypolicy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
{{- $useHostNetwork := .Values.controller.daemonset.useHostNetwork }}
2020
{{- $useHostPort := .Values.controller.daemonset.useHostPort }}
2121
{{- $hostPorts := .Values.controller.daemonset.hostPorts -}}
22-
{{- if .Capabilities.APIVersions.Has "policy/v1/PodSecurityPolicy" }}
22+
{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodSecurityPolicy") (semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version) }}
2323
apiVersion: policy/v1
2424
{{- else }}
2525
apiVersion: policy/v1beta1

kubernetes-ingress/templates/controller-service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- name: http
4848
port: {{ .Values.controller.service.ports.http }}
4949
protocol: TCP
50-
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
50+
{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
5151
appProtocol: http
5252
{{- end }}
5353
targetPort: {{ .Values.controller.service.targetPorts.http }}
@@ -59,7 +59,7 @@ spec:
5959
- name: https
6060
port: {{ .Values.controller.service.ports.https }}
6161
protocol: TCP
62-
{{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
62+
{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
6363
appProtocol: https
6464
{{- end }}
6565
targetPort: {{ .Values.controller.service.targetPorts.https }}

0 commit comments

Comments
 (0)