From b6b52eaffb23dc966f25e666298626af541e611d Mon Sep 17 00:00:00 2001 From: hanayo04 <135773597+hanayo04@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:43:53 +0900 Subject: [PATCH] Revert "Reapply "bump k8s"" --- Makefile | 8 ++++---- akka/Makefile | 16 ++++++++-------- argoproj-crd/Makefile | 4 ++-- aws-ebs-csi-driver/Makefile | 4 ++-- aws-secret-operator/Makefile | 4 ++-- burrow/Makefile | 4 ++-- docker-registry/Makefile | 4 ++-- dynamodb/Makefile | 4 ++-- elasticmq/Makefile | 4 ++-- elasticsearch/Makefile | 2 +- envoy/Makefile | 6 +++--- example/Makefile | 4 ++-- fluent-bit/Makefile | 2 +- fluentd/Makefile | 10 +++++----- gcp-credentials/Makefile | 4 ++-- kube-schedule-scaler/Makefile | 4 ++-- mailcatcher/Makefile | 4 ++-- mysql/Makefile | 4 ++-- newrelic-php-agent/Makefile | 4 ++-- php/Makefile | 4 ++-- postfix/Makefile | 10 +++++----- raw/Makefile | 2 +- regcred/Makefile | 4 ++-- slime/Makefile | 12 ++++++------ twistlock-console/Makefile | 4 ++-- twistlock-defender/Makefile | 4 ++-- 26 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index e708bb36..e8a76f7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -KIND_VERSION = 0.23.0 -KUBERNETES_VERSION = 1.30.0 -KIND_NODE_HASH = 047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e -HELM_VERSION = 3.15.1 +KIND_VERSION = 0.20.0 +KUBERNETES_VERSION = 1.28.0 +KIND_NODE_HASH = b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 +HELM_VERSION = 3.13.2 KUBEVAL_VERSION = 0.16.1 .PHONY: apply diff --git a/akka/Makefile b/akka/Makefile index e838ceaf..00838c9e 100644 --- a/akka/Makefile +++ b/akka/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-local-akka-http @@ -23,42 +23,42 @@ lint-local-akka-http: @echo "=> Linting examples/local-akka-http.yaml" helm lint --strict -f examples/local-akka-http.yaml @echo "=> Validating examples/local-akka-http.yaml" - helm template -f examples/local-akka-http.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/local-akka-http.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cluster-discovery-dns lint-cluster-discovery-dns: @echo "=> Linting examples/cluster-discovery-dns.yaml" helm lint --strict -f examples/cluster-discovery-dns.yaml @echo "=> Validating examples/cluster-discovery-dns.yaml" - helm template -f examples/cluster-discovery-dns.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cluster-discovery-dns.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cluster-discovery-kubernetes-api lint-cluster-discovery-kubernetes-api: @echo "=> Linting examples/cluster-discovery-kubernetes-api.yaml" helm lint --strict -f examples/cluster-discovery-kubernetes-api.yaml @echo "=> Validating examples/cluster-discovery-kubernetes-api.yaml" - helm template -f examples/cluster-discovery-kubernetes-api.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cluster-discovery-kubernetes-api.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cluster-discovery-aggregate lint-cluster-discovery-aggregate: @echo "=> Linting examples/cluster-discovery-aggregate.yaml" helm lint --strict -f examples/cluster-discovery-aggregate.yaml @echo "=> Validating examples/cluster-discovery-aggregate.yaml" - helm template -f examples/cluster-discovery-aggregate.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cluster-discovery-aggregate.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cluster-multi-eks-cluster lint-cluster-multi-eks-cluster: @echo "=> Linting examples/cluster-multi-eks-cluster.yaml" helm lint --strict -f examples/cluster-multi-eks-cluster.yaml @echo "=> Validating examples/cluster-multi-eks-cluster.yaml" - helm template -f examples/cluster-multi-eks-cluster.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cluster-multi-eks-cluster.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-use-environment-variable-and-secret lint-use-environment-variable-and-secret: @echo "=> Linting examples/use-environment-variable-and-secret.yaml" helm lint --strict -f examples/use-environment-variable-and-secret.yaml @echo "=> Validating examples/use-environment-variable-and-secret.yaml" - helm template -f examples/use-environment-variable-and-secret.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/use-environment-variable-and-secret.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: test test: test-local-akka-http test-cluster-discovery-dns test-cluster-discovery-kubernetes-api test-use-environment-variable-and-secret test-default diff --git a/argoproj-crd/Makefile b/argoproj-crd/Makefile index 19f14c34..9242b419 100644 --- a/argoproj-crd/Makefile +++ b/argoproj-crd/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -19,7 +19,7 @@ lint-default: helm lint --strict @echo "" @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/aws-ebs-csi-driver/Makefile b/aws-ebs-csi-driver/Makefile index 5be90ea3..d68b08aa 100644 --- a/aws-ebs-csi-driver/Makefile +++ b/aws-ebs-csi-driver/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -16,7 +16,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/aws-secret-operator/Makefile b/aws-secret-operator/Makefile index 8addbcfc..6684e1af 100644 --- a/aws-secret-operator/Makefile +++ b/aws-secret-operator/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/burrow/Makefile b/burrow/Makefile index fb191f54..36236978 100644 --- a/burrow/Makefile +++ b/burrow/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -16,7 +16,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/docker-registry/Makefile b/docker-registry/Makefile index 7f5b0350..d074c90d 100644 --- a/docker-registry/Makefile +++ b/docker-registry/Makefile @@ -1,5 +1,5 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = "$$(basename $$PWD)" .PHONY: install @@ -16,7 +16,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/dynamodb/Makefile b/dynamodb/Makefile index f4e37ca4..e07ee62f 100644 --- a/dynamodb/Makefile +++ b/dynamodb/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/elasticmq/Makefile b/elasticmq/Makefile index f4e37ca4..e07ee62f 100644 --- a/elasticmq/Makefile +++ b/elasticmq/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/elasticsearch/Makefile b/elasticsearch/Makefile index 4c21e401..ca5c50df 100644 --- a/elasticsearch/Makefile +++ b/elasticsearch/Makefile @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/envoy/Makefile b/envoy/Makefile index 4fae50a0..b1548737 100644 --- a/envoy/Makefile +++ b/envoy/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-xds @@ -25,7 +25,7 @@ lint-xds: @echo "=> Linting default values.yaml" helm lint -f example/xds.yaml --strict @echo "=> Validating default value.yaml" - helm template -f example/xds.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f example/xds.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/example/Makefile b/example/Makefile index f4e37ca4..e07ee62f 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/fluent-bit/Makefile b/fluent-bit/Makefile index 4c21e401..ca5c50df 100644 --- a/fluent-bit/Makefile +++ b/fluent-bit/Makefile @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/fluentd/Makefile b/fluentd/Makefile index 5bc2ca11..f66d98e7 100644 --- a/fluentd/Makefile +++ b/fluentd/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-daemonset @@ -23,21 +23,21 @@ lint-daemonset: @echo "=> Linting examples/daemonset.yaml" helm lint --strict -f examples/daemonset.yaml @echo "=> Validating examples/daemonset.yaml" - helm template -f examples/daemonset.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/daemonset.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-statefulset lint-statefulset: @echo "=> Linting examples/statefulset.yaml" helm lint --strict -f examples/statefulset.yaml @echo "=> Validating examples/statefulset.yaml" - helm template -f examples/statefulset.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/statefulset.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-use-udp lint-use-udp: @echo "=> Linting examples/use-udp.yaml" helm lint --strict -f examples/use-udp.yaml @echo "=> Validating examples/use-udp.yaml" - helm template -f examples/use-udp.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/use-udp.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: test test: test-daemonset test-statefulset test-use-udp test-default diff --git a/gcp-credentials/Makefile b/gcp-credentials/Makefile index 8addbcfc..6684e1af 100644 --- a/gcp-credentials/Makefile +++ b/gcp-credentials/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/kube-schedule-scaler/Makefile b/kube-schedule-scaler/Makefile index 8addbcfc..6684e1af 100644 --- a/kube-schedule-scaler/Makefile +++ b/kube-schedule-scaler/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/mailcatcher/Makefile b/mailcatcher/Makefile index 3f066919..a418bca3 100644 --- a/mailcatcher/Makefile +++ b/mailcatcher/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/mysql/Makefile b/mysql/Makefile index 6717a84b..7cdcf835 100644 --- a/mysql/Makefile +++ b/mysql/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/newrelic-php-agent/Makefile b/newrelic-php-agent/Makefile index f4e37ca4..e07ee62f 100644 --- a/newrelic-php-agent/Makefile +++ b/newrelic-php-agent/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/php/Makefile b/php/Makefile index 17a16fe6..b798a942 100644 --- a/php/Makefile +++ b/php/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/postfix/Makefile b/postfix/Makefile index 38e24f47..620a9ee6 100644 --- a/postfix/Makefile +++ b/postfix/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) helmInstallOptions = -i --wait --set "terminationGracePeriodSeconds=0" @@ -18,7 +18,7 @@ lint-daemonset: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-daemonset-mailcatcher @@ -26,7 +26,7 @@ lint-daemonset-mailcatcher: @echo "=> Linting default values.yaml" helm lint $(mailcatcher) --strict @echo "=> Validating default value.yaml" - helm template $(mailcatcher) . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template $(mailcatcher) . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-deployment @@ -34,7 +34,7 @@ lint-deployment: @echo "=> Linting default values.yaml" helm lint --set deployment.enabled=true --set daemonset.enabled=false --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP --strict @echo "=> Validating default value.yaml" - helm template --set deployment.enabled=true --set daemonset.enabled=false --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template --set deployment.enabled=true --set daemonset.enabled=false --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: lint-deployment-mailcatcher @@ -42,7 +42,7 @@ lint-deployment-mailcatcher: @echo "=> Linting default values.yaml" helm lint --set deployment.enabled=true --set daemonset.enabled=false $(mailcatcher) --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP --strict @echo "=> Validating default value.yaml" - helm template --set deployment.enabled=true --set daemonset.enabled=false $(mailcatcher) --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template --set deployment.enabled=true --set daemonset.enabled=false $(mailcatcher) --set deployment.podDisruptionBudget.enabled=true --set deployment.service.type=ClusterIP . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/raw/Makefile b/raw/Makefile index 8399cefd..c27f183d 100644 --- a/raw/Makefile +++ b/raw/Makefile @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/regcred/Makefile b/regcred/Makefile index 8addbcfc..6684e1af 100644 --- a/regcred/Makefile +++ b/regcred/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/slime/Makefile b/slime/Makefile index f9e9691c..8b1ec0ef 100644 --- a/slime/Makefile +++ b/slime/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -13,35 +13,35 @@ lint-deployment: @echo "=> Linting examples/deployment.yaml" helm lint --strict -f examples/deployment.yaml @echo "=> Validating examples/deployment.yaml" - helm template -f examples/deployment.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/deployment.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-deployment-ingress lint-deployment-ingress: @echo "=> Linting examples/deployment-ingress.yaml" helm lint --strict -f examples/deployment-ingress.yaml @echo "=> Validating examples/deployment-ingress.yaml" - helm template -f examples/deployment-ingress.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/deployment-ingress.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-deployment-hpa lint-deployment-hpa: @echo "=> Linting examples/deployment-hpa.yaml" helm lint --strict -f examples/deployment-hpa.yaml @echo "=> Validating examples/deployment-hpa.yaml" - helm template -f examples/deployment-hpa.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/deployment-hpa.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cronjob lint-cronjob: @echo "=> Linting examples/cronjob.yaml" helm lint --strict -f examples/cronjob.yaml @echo "=> Validating examples/cronjob.yaml" - helm template -f examples/cronjob.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cronjob.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: lint-cronjob-advanced lint-cronjob-advanced: @echo "=> Linting examples/cronjob-advanced.yaml" helm lint --strict -f examples/cronjob-advanced.yaml @echo "=> Validating examples/cronjob-advanced.yaml" - helm template -f examples/cronjob-advanced.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template -f examples/cronjob-advanced.yaml . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error .PHONY: test test: test-deployment test-cronjob test-cronjob-advanced diff --git a/twistlock-console/Makefile b/twistlock-console/Makefile index b76cb40d..76fc006d 100644 --- a/twistlock-console/Makefile +++ b/twistlock-console/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test diff --git a/twistlock-defender/Makefile b/twistlock-defender/Makefile index b76cb40d..76fc006d 100644 --- a/twistlock-defender/Makefile +++ b/twistlock-defender/Makefile @@ -1,4 +1,4 @@ -KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"} +KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"} RELEASE = $$(basename $$PWD) .PHONY: install @@ -15,7 +15,7 @@ lint-default: @echo "=> Linting default values.yaml" helm lint --strict @echo "=> Validating default value.yaml" - helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/chatwork/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error + helm template . | kubeval --strict --ignore-missing-schemas --additional-schema-locations https://raw.githubusercontent.com/cw-ozaki/kubernetes-json-schema/master/ --kubernetes-version $(KUBERNETES_VERSION) --exit-on-error @echo "" .PHONY: test