Skip to content

Commit 469156a

Browse files
givanovgivanov
authored
feat: prow upgrade (#34)
* feat: update prow dependencies Signed-off-by: Georgi Ivanov <georgi@ouzi.dev> * feat: update prow version and other tweaks Signed-off-by: Georgi Ivanov <georgi@ouzi.dev> * feat: set kubeval version to 1.21.0 Signed-off-by: Georgi Ivanov <georgi@ouzi.dev> * fix: force recheck Signed-off-by: Georgi Ivanov <georgi@ouzi.dev> * feat: update toolbox image Signed-off-by: Georgi Ivanov <georgi@ouzi.dev> Signed-off-by: Georgi Ivanov <georgi@ouzi.dev>
1 parent 61ff0c3 commit 469156a

File tree

13 files changed

+4002
-4981
lines changed

13 files changed

+4002
-4981
lines changed

‎.prow.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ presubmits:
1212
containers:
1313
- name: "validate"
1414
imagePullPolicy: IfNotPresent
15-
image: quay.io/ouzi/toolbox:0.1.17
15+
image: quay.io/ouzi/toolbox:0.2.1
1616
command:
1717
- make
1818
args:
@@ -31,7 +31,7 @@ presubmits:
3131
containers:
3232
- name: "test-package"
3333
imagePullPolicy: IfNotPresent
34-
image: quay.io/ouzi/toolbox:0.1.17
34+
image: quay.io/ouzi/toolbox:0.2.1
3535
command:
3636
- make
3737
args:
@@ -51,7 +51,7 @@ presubmits:
5151
containers:
5252
- name: "test-semrelease-dryrun"
5353
imagePullPolicy: IfNotPresent
54-
image: quay.io/ouzi/toolbox:0.1.17
54+
image: quay.io/ouzi/toolbox:0.2.1
5555
command:
5656
- make
5757
args:
@@ -69,7 +69,7 @@ postsubmits:
6969
containers:
7070
- name: "release"
7171
imagePullPolicy: Always
72-
image: quay.io/ouzi/toolbox:0.1.17
72+
image: quay.io/ouzi/toolbox:0.2.1
7373
command:
7474
- make
7575
args:

‎Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,25 @@ DIST_VERSION ?= canary
88
RELEASE = $(DIST_DIR)/prow-installer-$(DIST_VERSION).tar.gz
99

1010
HELM_PLUGIN_DIFF_URL := https://github.com/databus23/helm-diff
11-
HELM_PLUGIN_DIFF_VERSION := v3.0.0-rc.7
11+
HELM_PLUGIN_DIFF_VERSION := v3.5.0
12+
13+
HELM_PLUGIN_MAP_KUBE_APIS_URL := https://github.com/helm/helm-mapkubeapis
14+
HELM_PLUGIN_MAP_KUBE_APIS_VERSION := v0.3.0
1215

1316
.PHONY: init
1417
init:
1518
helm plugin install $(HELM_PLUGIN_DIFF_URL) --version $(HELM_PLUGIN_DIFF_VERSION) || echo "Plugin already installed - nothing to do"
19+
helm plugin install $(HELM_PLUGIN_MAP_KUBE_APIS_URL) --version $(HELM_PLUGIN_MAP_KUBE_APIS_VERSION) || echo "Plugin already installed - nothing to do"
1620
# plugin to handle deprecated apis
1721
helm plugin install https://github.com/hickeyma/helm-mapkubeapis || echo "Plugin already installed - nothing to do"
1822
helm repo add stable https://charts.helm.sh/stable
1923
helm repo add jetstack https://charts.jetstack.io
2024
helm repo add estafette https://helm.estafette.io
2125
helm repo add bitnami https://charts.bitnami.com/bitnami
26+
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
2227
helm repo update
2328

29+
2430
.PHONY: deploy
2531
deploy: $(addsuffix -deploy,$($*DIRECTORY:/=))
2632

‎install.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SHELL = /usr/bin/env bash -eo pipefail
33
DRY_RUN ?= false
44
VALIDATE ?= false
55

6-
KUBEVAL_OPTS ?= --strict --kubernetes-version 1.16.0 --ignore-missing-schemas
6+
KUBEVAL_OPTS ?= --strict --kubernetes-version 1.21.0 --ignore-missing-schemas
77

88
VALUES ?= values.yaml
99
K8SAPI_DEPRECATED_MAPPINGS ?= k8sapi_deprecated_mappings.yaml
@@ -139,7 +139,7 @@ ifeq ($(DRY_RUN),true)
139139
--values $(FOLDER)/$(SUBFOLDER)/.values.yaml
140140
else ifeq ($(DRY_RUN),false)
141141
@echo **Migrating deprecated or removed Kubernetes APIs in Helm storage
142-
@helm mapkubeapis --namespace $(NAMESPACE) --mapfile $(K8SAPI_DEPRECATED_MAPPINGS) $(NAME)
142+
@helm mapkubeapis --namespace $(NAMESPACE) --mapfile $(K8SAPI_DEPRECATED_MAPPINGS) $(NAME) || true
143143
@echo **Upgrading helm chart $(CHART) $(NAME) $(VERSION) from $(FOLDER)/$(SUBFOLDER) in $(NAMESPACE)
144144
@helm upgrade \
145145
$(NAME) \
@@ -189,7 +189,7 @@ ifeq ($(DRY_RUN),true)
189189
--values $(FOLDER)/$(SUBFOLDER)/.values.yaml
190190
else ifeq ($(DRY_RUN),false)
191191
@echo **Migrating deprecated or removed Kubernetes APIs in Helm storage
192-
@helm mapkubeapis --namespace $(NAMESPACE) --mapfile $(K8SAPI_DEPRECATED_MAPPINGS) $(NAME)
192+
@helm mapkubeapis --namespace $(NAMESPACE) --mapfile $(K8SAPI_DEPRECATED_MAPPINGS) $(NAME) || true
193193
@echo **Upgrading helm chart $(CHART) $(NAME) $(VERSION) from $(FOLDER)/$(SUBFOLDER) in $(NAMESPACE)
194194
@helm upgrade \
195195
$(NAME) \

‎k8sapi_deprecated_mappings.yaml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,32 @@ mappings:
1010
- deprecatedAPI: "apiVersion: apps/v1beta2\nkind: Deployment"
1111
newAPI: "apiVersion: apps/v1\nkind: Deployment"
1212
deprecatedInVersion: "v1.9"
13-
removedInVersion: "v1.16"
13+
removedInVersion: "v1.16"
14+
- deprecatedAPI: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: ClusterRole"
15+
newAPI: "apiVersion: rbac.authorization.k8s.io/v1\nkind: ClusterRole"
16+
deprecatedInVersion: "v1.21"
17+
removedInVersion: "v1.22"
18+
- deprecatedAPI: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: ClusterRoleBinding"
19+
newAPI: "apiVersion: rbac.authorization.k8s.io/v1\nkind: ClusterRoleBinding"
20+
deprecatedInVersion: "v1.21"
21+
removedInVersion: "v1.22"
22+
- deprecatedAPI: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: Role"
23+
newAPI: "apiVersion: rbac.authorization.k8s.io/v1\nkind: Role"
24+
deprecatedInVersion: "v1.21"
25+
removedInVersion: "v1.22"
26+
- deprecatedAPI: "apiVersion: rbac.authorization.k8s.io/v1beta1\nkind: RoleBinding"
27+
newAPI: "apiVersion: rbac.authorization.k8s.io/v1\nkind: RoleBinding"
28+
deprecatedInVersion: "v1.21"
29+
removedInVersion: "v1.22"
30+
- deprecatedAPI: "apiVersion: autoscaling/v2beta1\nkind: HorizontalPodAutoscaler"
31+
newAPI: "apiVersion: autoscaling/v2beta2\nkind: HorizontalPodAutoscaler"
32+
deprecatedInVersion: "v1.21"
33+
removedInVersion: "v1.22"
34+
- deprecatedAPI: "apiVersion: policy/v1beta1\nkind: PodDisruptionBudget"
35+
newAPI: "apiVersion: policy/v1\nkind: PodDisruptionBudget"
36+
deprecatedInVersion: "v1.21"
37+
removedInVersion: "v1.22"
38+
- deprecatedAPI: "apiVersion: batch/v1beta1\nkind: CronJob"
39+
newAPI: "apiVersion: batch/v1\nkind: CronJob"
40+
deprecatedInVersion: "v1.21"
41+
removedInVersion: "v1.25"

0 commit comments

Comments
 (0)