From 1a9e75d0a2d660bb38abfeb0c8215f19cf59a797 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 13 Apr 2024 02:12:48 +0000
Subject: [PATCH 1/3] chore(deps): update grouped non-major updates (#171)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)
This PR contains the following updates:
| Package | Update | Change |
|---|---|---|
|
[losisin/helm-values-schema-json](https://togithub.com/losisin/helm-values-schema-json)
| patch | `v1.2.2` -> `v1.2.4` |
|
[prometheus-operator/prometheus-operator](https://togithub.com/prometheus-operator/prometheus-operator)
| patch | `v0.73.0` -> `v0.73.1` |
---
### Release Notes
losisin/helm-values-schema-json
(losisin/helm-values-schema-json)
###
[`v1.2.4`](https://togithub.com/losisin/helm-values-schema-json/releases/tag/v1.2.4)
[Compare
Source](https://togithub.com/losisin/helm-values-schema-json/compare/v1.2.3...v1.2.4)
#### Changelog
-
[`ba032c9`](https://togithub.com/losisin/helm-values-schema-json/commit/ba032c9)
Merge pull request
[#55](https://togithub.com/losisin/helm-values-schema-json/issues/55)
from Jonasei/patch-1
-
[`25feb0c`](https://togithub.com/losisin/helm-values-schema-json/commit/25feb0c)
Merge pull request
[#57](https://togithub.com/losisin/helm-values-schema-json/issues/57)
from losisin/feature/add-patternProperties
-
[`9ef714a`](https://togithub.com/losisin/helm-values-schema-json/commit/9ef714a)
Merge pull request
[#58](https://togithub.com/losisin/helm-values-schema-json/issues/58)
from losisin/bump-version
-
[`9f4ce65`](https://togithub.com/losisin/helm-values-schema-json/commit/9f4ce65)
Update README.md
-
[`ebddf6e`](https://togithub.com/losisin/helm-values-schema-json/commit/ebddf6e)
add patternProperties from comments
-
[`1f9cbab`](https://togithub.com/losisin/helm-values-schema-json/commit/1f9cbab)
bump version to 1.2.4
###
[`v1.2.3`](https://togithub.com/losisin/helm-values-schema-json/releases/tag/v1.2.3)
[Compare
Source](https://togithub.com/losisin/helm-values-schema-json/compare/v1.2.2...v1.2.3)
#### Changelog
-
[`cf57ddf`](https://togithub.com/losisin/helm-values-schema-json/commit/cf57ddf)
Merge pull request
[#53](https://togithub.com/losisin/helm-values-schema-json/issues/53)
from losisin/feature/add-description
-
[`7e6bbed`](https://togithub.com/losisin/helm-values-schema-json/commit/7e6bbed)
Merge pull request
[#54](https://togithub.com/losisin/helm-values-schema-json/issues/54)
from losisin/bump-version
-
[`bfc0aad`](https://togithub.com/losisin/helm-values-schema-json/commit/bfc0aad)
add description from comments
-
[`bc9cbbf`](https://togithub.com/losisin/helm-values-schema-json/commit/bc9cbbf)
add some more tests
-
[`8fdeba3`](https://togithub.com/losisin/helm-values-schema-json/commit/8fdeba3)
bump version to 1.2.3
prometheus-operator/prometheus-operator
(prometheus-operator/prometheus-operator)
###
[`v0.73.1`](https://togithub.com/prometheus-operator/prometheus-operator/compare/v0.73.0...v0.73.1)
[Compare
Source](https://togithub.com/prometheus-operator/prometheus-operator/compare/v0.73.0...v0.73.1)
---
### Configuration
📅 **Schedule**: Branch creation - "* * * * 6" (UTC), Automerge - At any
time (no schedule defined).
🚦 **Automerge**: Enabled.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.
👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.
---
- [ ] If you want to rebase/retry this PR, check
this box
---
This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/aenix-io/etcd-operator).
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 276fce78..88802e92 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ KIND_CLUSTER_NAME ?= etcd-operator-kind
NAMESPACE ?= etcd-operator-system
# renovate: datasource=github-tags depName=prometheus-operator/prometheus-operator
-PROMETHEUS_OPERATOR_VERSION ?= v0.73.0
+PROMETHEUS_OPERATOR_VERSION ?= v0.73.1
# renovate: datasource=github-tags depName=jetstack/cert-manager
CERT_MANAGER_VERSION ?= v1.14.4
@@ -237,7 +237,7 @@ KIND_VERSION ?= v0.22.0
# renovate: datasource=github-tags depName=helm/helm
HELM_VERSION ?= v3.14.4
# renovate: datasource=github-tags depName=losisin/helm-values-schema-json
-HELM_SCHEMA_VERSION ?= v1.2.2
+HELM_SCHEMA_VERSION ?= v1.2.4
# renovate: datasource=github-tags depName=norwoodj/helm-docs
HELM_DOCS_VERSION ?= v1.13.1
# renovate: datasource=github-tags depName=mikefarah/yq
From f21616c04919e984f3d9ed202e0f0389a2e13265 Mon Sep 17 00:00:00 2001
From: Sergei Monakhov
Date: Sat, 13 Apr 2024 09:31:10 +0300
Subject: [PATCH 2/3] Fix double import core/v1 pkg for sts test file (#170)
---
.../controller/factory/statefulset_test.go | 233 +++++++++---------
1 file changed, 116 insertions(+), 117 deletions(-)
diff --git a/internal/controller/factory/statefulset_test.go b/internal/controller/factory/statefulset_test.go
index b57bdc5f..724692a8 100644
--- a/internal/controller/factory/statefulset_test.go
+++ b/internal/controller/factory/statefulset_test.go
@@ -28,7 +28,6 @@ import (
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@@ -74,17 +73,17 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
EmbeddedObjectMetadata: etcdaenixiov1alpha1.EmbeddedObjectMetadata{
Name: "etcd-data",
},
- Spec: v1.PersistentVolumeClaimSpec{
- AccessModes: []v1.PersistentVolumeAccessMode{
- v1.ReadWriteOnce,
+ Spec: corev1.PersistentVolumeClaimSpec{
+ AccessModes: []corev1.PersistentVolumeAccessMode{
+ corev1.ReadWriteOnce,
},
- Resources: v1.VolumeResourceRequirements{
- Requests: v1.ResourceList{
- v1.ResourceStorage: resource.MustParse("1Gi"),
+ Resources: corev1.VolumeResourceRequirements{
+ Requests: corev1.ResourceList{
+ corev1.ResourceStorage: resource.MustParse("1Gi"),
},
},
},
- Status: v1.PersistentVolumeClaimStatus{},
+ Status: corev1.PersistentVolumeClaimStatus{},
},
}
etcdcluster.Spec.PodTemplate = etcdaenixiov1alpha1.PodTemplate{
@@ -99,19 +98,19 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
},
Spec: etcdaenixiov1alpha1.PodSpec{
ServiceAccountName: "etcd-operator",
- ReadinessGates: []v1.PodReadinessGate{
+ ReadinessGates: []corev1.PodReadinessGate{
{
// Some custom readiness gate
ConditionType: "target-health.elbv2.k8s.aws",
},
},
- Containers: []v1.Container{
+ Containers: []corev1.Container{
{
Name: "etcd",
- Resources: v1.ResourceRequirements{
- Requests: v1.ResourceList{
- v1.ResourceCPU: resource.MustParse("100m"),
- v1.ResourceMemory: resource.MustParse("128Mi"),
+ Resources: corev1.ResourceRequirements{
+ Requests: corev1.ResourceList{
+ corev1.ResourceCPU: resource.MustParse("100m"),
+ corev1.ResourceMemory: resource.MustParse("128Mi"),
},
},
},
@@ -163,12 +162,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking the default startup probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].StartupProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].StartupProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz?serializable=false",
Port: intstr.FromInt32(2381),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
TimeoutSeconds: 1,
@@ -179,12 +178,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking the default readiness probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].ReadinessProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].ReadinessProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz",
Port: intstr.FromInt32(2381),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
TimeoutSeconds: 1,
@@ -195,12 +194,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking the default liveness probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].LivenessProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].LivenessProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
TimeoutSeconds: 1,
@@ -211,7 +210,7 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking generated security volumes", func() {
- Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(v1.Volume{
+ Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(corev1.Volume{
Name: "peer-trusted-ca-certificate",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
@@ -220,7 +219,7 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
},
},
}))
- Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(v1.Volume{
+ Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(corev1.Volume{
Name: "peer-certificate",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
@@ -229,7 +228,7 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
},
},
}))
- Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(v1.Volume{
+ Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(corev1.Volume{
Name: "server-certificate",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
@@ -238,7 +237,7 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
},
},
}))
- Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(v1.Volume{
+ Expect(sts.Spec.Template.Spec.Volumes).To(ContainElement(corev1.Volume{
Name: "client-trusted-ca-certificate",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
@@ -257,20 +256,20 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
It("should successfully override probes", func() {
etcdcluster := etcdcluster.DeepCopy()
etcdcluster.Spec.PodTemplate.Spec = etcdaenixiov1alpha1.PodSpec{
- Containers: []v1.Container{
+ Containers: []corev1.Container{
{
Name: "etcd",
- LivenessProbe: &v1.Probe{
+ LivenessProbe: &corev1.Probe{
InitialDelaySeconds: 13,
PeriodSeconds: 11,
},
- ReadinessProbe: &v1.Probe{
+ ReadinessProbe: &corev1.Probe{
PeriodSeconds: 3,
},
- StartupProbe: &v1.Probe{
+ StartupProbe: &corev1.Probe{
PeriodSeconds: 7,
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/test",
Port: intstr.FromInt32(2389),
},
@@ -288,12 +287,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
Expect(err).NotTo(HaveOccurred())
By("Checking the updated startup probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].StartupProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].StartupProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/test",
Port: intstr.FromInt32(2389),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
TimeoutSeconds: 1,
@@ -304,12 +303,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking the updated readiness probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].ReadinessProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].ReadinessProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz",
Port: intstr.FromInt32(2381),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
TimeoutSeconds: 1,
@@ -320,12 +319,12 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
By("Checking the updated liveness probe", func() {
- Expect(sts.Spec.Template.Spec.Containers[0].LivenessProbe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(sts.Spec.Template.Spec.Containers[0].LivenessProbe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
- Scheme: v1.URISchemeHTTP,
+ Scheme: corev1.URISchemeHTTP,
},
},
InitialDelaySeconds: 13,
@@ -346,7 +345,7 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
etcdcluster := etcdcluster.DeepCopy()
size := resource.MustParse("1Gi")
etcdcluster.Spec.Storage = etcdaenixiov1alpha1.StorageSpec{
- EmptyDir: &v1.EmptyDirVolumeSource{
+ EmptyDir: &corev1.EmptyDirVolumeSource{
SizeLimit: &size,
},
}
@@ -398,9 +397,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
Context("When getting liveness probe", func() {
It("should correctly get default values", func() {
probe := getLivenessProbe(nil)
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
},
@@ -409,9 +408,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override all values", func() {
- probe := getLivenessProbe(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ probe := getLivenessProbe(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/liveznew",
Port: intstr.FromInt32(2390),
},
@@ -419,9 +418,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
InitialDelaySeconds: 7,
PeriodSeconds: 3,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/liveznew",
Port: intstr.FromInt32(2390),
},
@@ -431,13 +430,13 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override partial changes", func() {
- probe := getLivenessProbe(&v1.Probe{
+ probe := getLivenessProbe(&corev1.Probe{
InitialDelaySeconds: 7,
PeriodSeconds: 3,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
},
@@ -451,9 +450,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
Context("When getting startup probe", func() {
It("should correctly get default values", func() {
probe := getStartupProbe(nil)
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz?serializable=false",
Port: intstr.FromInt32(2381),
},
@@ -462,9 +461,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override all values", func() {
- probe := getStartupProbe(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ probe := getStartupProbe(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz",
Port: intstr.FromInt32(2390),
},
@@ -472,9 +471,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
InitialDelaySeconds: 7,
PeriodSeconds: 3,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz",
Port: intstr.FromInt32(2390),
},
@@ -484,13 +483,13 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override partial changes", func() {
- probe := getStartupProbe(&v1.Probe{
+ probe := getStartupProbe(&corev1.Probe{
InitialDelaySeconds: 7,
PeriodSeconds: 3,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/readyz?serializable=false",
Port: intstr.FromInt32(2381),
},
@@ -504,9 +503,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
Context("When getting liveness probe", func() {
It("should correctly get default values", func() {
probe := getLivenessProbe(nil)
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
},
@@ -515,9 +514,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override all values", func() {
- probe := getLivenessProbe(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ probe := getLivenessProbe(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/liveznew",
Port: intstr.FromInt32(2371),
},
@@ -525,9 +524,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
InitialDelaySeconds: 11,
PeriodSeconds: 13,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/liveznew",
Port: intstr.FromInt32(2371),
},
@@ -537,13 +536,13 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}))
})
It("should correctly override partial changes", func() {
- probe := getLivenessProbe(&v1.Probe{
+ probe := getLivenessProbe(&corev1.Probe{
InitialDelaySeconds: 11,
PeriodSeconds: 13,
})
- Expect(probe).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ Expect(probe).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2381),
},
@@ -555,9 +554,9 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
})
Context("When merge with default probe", func() {
It("should correctly merge probe with default", func() {
- defaultProbe := v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- HTTPGet: &v1.HTTPGetAction{
+ defaultProbe := corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ HTTPGet: &corev1.HTTPGetAction{
Path: "/livez",
Port: intstr.FromInt32(2379),
},
@@ -566,18 +565,18 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
}
defaultProbeCopy := defaultProbe.DeepCopy()
- probe := &v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- Exec: &v1.ExecAction{
+ probe := &corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ Exec: &corev1.ExecAction{
Command: []string{"test"},
},
},
InitialDelaySeconds: 11,
}
result := mergeWithDefaultProbe(probe, defaultProbe)
- Expect(result).To(Equal(&v1.Probe{
- ProbeHandler: v1.ProbeHandler{
- Exec: &v1.ExecAction{
+ Expect(result).To(Equal(&corev1.Probe{
+ ProbeHandler: corev1.ProbeHandler{
+ Exec: &corev1.ExecAction{
Command: []string{"test"},
},
},
@@ -618,26 +617,26 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
localCluster := etcdCluster.DeepCopy()
localCluster.Spec.PodTemplate.Spec.Containers[0].VolumeMounts = append(
localCluster.Spec.PodTemplate.Spec.Containers[0].VolumeMounts,
- v1.VolumeMount{
+ corev1.VolumeMount{
Name: "test",
MountPath: "/test/tmp.txt",
},
)
localCluster.Spec.PodTemplate.Spec.Containers[0].EnvFrom = append(
localCluster.Spec.PodTemplate.Spec.Containers[0].EnvFrom,
- v1.EnvFromSource{
- ConfigMapRef: &v1.ConfigMapEnvSource{
- LocalObjectReference: v1.LocalObjectReference{Name: "test"},
+ corev1.EnvFromSource{
+ ConfigMapRef: &corev1.ConfigMapEnvSource{
+ LocalObjectReference: corev1.LocalObjectReference{Name: "test"},
},
},
)
localCluster.Spec.PodTemplate.Spec.Containers[0].Ports = append(
localCluster.Spec.PodTemplate.Spec.Containers[0].Ports,
- v1.ContainerPort{Name: "metrics", ContainerPort: 1111},
+ corev1.ContainerPort{Name: "metrics", ContainerPort: 1111},
)
localCluster.Spec.PodTemplate.Spec.Containers = append(
localCluster.Spec.PodTemplate.Spec.Containers,
- v1.Container{
+ corev1.Container{
Name: "exporter",
Image: "etcd-exporter",
},
@@ -645,18 +644,18 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
containers := generateContainers(localCluster)
if Expect(containers).To(HaveLen(2)) {
- Expect(containers[0].EnvFrom).To(ContainElement(v1.EnvFromSource{
- ConfigMapRef: &v1.ConfigMapEnvSource{
- LocalObjectReference: v1.LocalObjectReference{Name: "test"},
+ Expect(containers[0].EnvFrom).To(ContainElement(corev1.EnvFromSource{
+ ConfigMapRef: &corev1.ConfigMapEnvSource{
+ LocalObjectReference: corev1.LocalObjectReference{Name: "test"},
},
}))
- Expect(containers[0].Ports).To(ContainElement(v1.ContainerPort{Name: "metrics", ContainerPort: 1111}))
+ Expect(containers[0].Ports).To(ContainElement(corev1.ContainerPort{Name: "metrics", ContainerPort: 1111}))
if Expect(containers[0].VolumeMounts).To(HaveLen(2)) {
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "data",
MountPath: "/var/run/etcd",
}))
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "test",
MountPath: "/test/tmp.txt",
}))
@@ -667,21 +666,21 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
localCluster := etcdCluster.DeepCopy()
localCluster.Spec.PodTemplate.Spec.Containers[0].VolumeMounts = append(
localCluster.Spec.PodTemplate.Spec.Containers[0].VolumeMounts,
- v1.VolumeMount{
+ corev1.VolumeMount{
Name: "data",
MountPath: "/test/tmp.txt",
},
)
localCluster.Spec.PodTemplate.Spec.Containers[0].Ports = append(
localCluster.Spec.PodTemplate.Spec.Containers[0].Ports,
- v1.ContainerPort{Name: "client", ContainerPort: 1111},
+ corev1.ContainerPort{Name: "client", ContainerPort: 1111},
)
containers := generateContainers(localCluster)
if Expect(containers).To(HaveLen(1)) {
- Expect(containers[0].Ports).NotTo(ContainElement(v1.ContainerPort{Name: "client", ContainerPort: 1111}))
+ Expect(containers[0].Ports).NotTo(ContainElement(corev1.ContainerPort{Name: "client", ContainerPort: 1111}))
if Expect(containers[0].VolumeMounts).To(HaveLen(1)) {
- Expect(containers[0].VolumeMounts).NotTo(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).NotTo(ContainElement(corev1.VolumeMount{
Name: "data",
MountPath: "/tmp",
}))
@@ -702,22 +701,22 @@ var _ = Describe("CreateOrUpdateStatefulSet handler", func() {
containers := generateContainers(localCluster)
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "peer-trusted-ca-certificate",
MountPath: "/etc/etcd/pki/peer/ca",
ReadOnly: true,
}))
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "peer-certificate",
MountPath: "/etc/etcd/pki/peer/cert",
ReadOnly: true,
}))
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "server-certificate",
MountPath: "/etc/etcd/pki/server/cert",
ReadOnly: true,
}))
- Expect(containers[0].VolumeMounts).To(ContainElement(v1.VolumeMount{
+ Expect(containers[0].VolumeMounts).To(ContainElement(corev1.VolumeMount{
Name: "client-trusted-ca-certificate",
MountPath: "/etc/etcd/pki/client/ca",
ReadOnly: true,
From 69660649b8d264227ce22fd43c892cd9e6aad649 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil
Date: Sat, 13 Apr 2024 08:41:48 +0200
Subject: [PATCH 3/3] Add Kamaji example (#164)
fixes #162
Signed-off-by: Andrei Kvapil
---
examples/manifests/etcdcluster-kamaji.yaml | 216 +++++++++++++++++++++
1 file changed, 216 insertions(+)
create mode 100644 examples/manifests/etcdcluster-kamaji.yaml
diff --git a/examples/manifests/etcdcluster-kamaji.yaml b/examples/manifests/etcdcluster-kamaji.yaml
new file mode 100644
index 00000000..5a198afb
--- /dev/null
+++ b/examples/manifests/etcdcluster-kamaji.yaml
@@ -0,0 +1,216 @@
+---
+apiVersion: etcd.aenix.io/v1alpha1
+kind: EtcdCluster
+metadata:
+ name: etcd
+ namespace: kamaji-system
+spec:
+ storage: {}
+ security:
+ tls:
+ peerTrustedCASecret: etcd-peer-ca-tls
+ peerSecret: etcd-peer-tls
+ serverSecret: etcd-server-tls
+ clientTrustedCASecret: etcd-ca-tls
+ clientSecret: etcd-client-tls
+---
+apiVersion: kamaji.clastix.io/v1alpha1
+kind: DataStore
+metadata:
+ name: default
+spec:
+ driver: etcd
+ endpoints:
+ - etcd-0.etcd.kamaji-system.svc:2379
+ - etcd-1.etcd.kamaji-system.svc:2379
+ - etcd-2.etcd.kamaji-system.svc:2379
+ tlsConfig:
+ certificateAuthority:
+ certificate:
+ secretReference:
+ keyPath: tls.crt
+ name: etcd-ca-tls
+ namespace: kamaji-system
+ privateKey:
+ secretReference:
+ keyPath: tls.key
+ name: etcd-ca-tls
+ namespace: kamaji-system
+ clientCertificate:
+ certificate:
+ secretReference:
+ keyPath: tls.crt
+ name: etcd-client-tls
+ namespace: kamaji-system
+ privateKey:
+ secretReference:
+ keyPath: tls.key
+ name: etcd-client-tls
+ namespace: kamaji-system
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+ name: etcd-selfsigning-issuer
+ namespace: kamaji-system
+spec:
+ selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: etcd-peer-ca
+ namespace: kamaji-system
+spec:
+ isCA: true
+ usages:
+ - "signing"
+ - "key encipherment"
+ - "cert sign"
+ commonName: etcd-peer-ca
+ subject:
+ organizations:
+ - ACME Inc.
+ organizationalUnits:
+ - Widgets
+ secretName: etcd-peer-ca-tls
+ privateKey:
+ algorithm: RSA
+ size: 4096
+ issuerRef:
+ name: etcd-selfsigning-issuer
+ kind: Issuer
+ group: cert-manager.io
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: etcd-ca
+ namespace: kamaji-system
+spec:
+ isCA: true
+ usages:
+ - "signing"
+ - "key encipherment"
+ - "cert sign"
+ commonName: etcd-ca
+ subject:
+ organizations:
+ - ACME Inc.
+ organizationalUnits:
+ - Widgets
+ secretName: etcd-ca-tls
+ privateKey:
+ algorithm: RSA
+ size: 4096
+ issuerRef:
+ name: etcd-selfsigning-issuer
+ kind: Issuer
+ group: cert-manager.io
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+ name: etcd-peer-issuer
+ namespace: kamaji-system
+spec:
+ ca:
+ secretName: etcd-peer-ca-tls
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+ name: etcd-issuer
+ namespace: kamaji-system
+spec:
+ ca:
+ secretName: etcd-ca-tls
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: etcd-server
+ namespace: kamaji-system
+spec:
+ secretName: etcd-server-tls
+ isCA: false
+ usages:
+ - "server auth"
+ - "signing"
+ - "key encipherment"
+ dnsNames:
+ - etcd-0
+ - etcd-0.etcd
+ - etcd-0.etcd.kamaji-system.svc
+ - etcd-0.etcd.kamaji-system.svc.cluster.local
+ - etcd-1
+ - etcd-1.etcd
+ - etcd-1.etcd.kamaji-system.svc
+ - etcd-1.etcd.kamaji-system.svc.cluster.local
+ - etcd-2
+ - etcd-2.etcd
+ - etcd-2.etcd.kamaji-system.svc
+ - etcd-2.etcd.kamaji-system.svc.cluster.local
+ - localhost
+ - "127.0.0.1"
+ privateKey:
+ rotationPolicy: Always
+ algorithm: RSA
+ size: 4096
+ issuerRef:
+ name: etcd-issuer
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: etcd-peer
+ namespace: kamaji-system
+spec:
+ secretName: etcd-peer-tls
+ isCA: false
+ usages:
+ - "server auth"
+ - "client auth"
+ - "signing"
+ - "key encipherment"
+ dnsNames:
+ - etcd-0
+ - etcd-0.etcd
+ - etcd-0.etcd.kamaji-system.svc
+ - etcd-0.etcd.kamaji-system.svc.cluster.local
+ - etcd-1
+ - etcd-1.etcd
+ - etcd-1.etcd.kamaji-system.svc
+ - etcd-1.etcd.kamaji-system.svc.cluster.local
+ - etcd-2
+ - etcd-2.etcd
+ - etcd-2.etcd.kamaji-system.svc
+ - etcd-2.etcd.kamaji-system.svc.cluster.local
+ - localhost
+ - "127.0.0.1"
+ privateKey:
+ rotationPolicy: Always
+ algorithm: RSA
+ size: 4096
+ issuerRef:
+ name: etcd-peer-issuer
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: etcd-client
+ namespace: kamaji-system
+spec:
+ commonName: root
+ secretName: etcd-client-tls
+ usages:
+ - "signing"
+ - "key encipherment"
+ - "client auth"
+ privateKey:
+ rotationPolicy: Always
+ algorithm: RSA
+ size: 4096
+ issuerRef:
+ name: etcd-issuer
+ kind: Issuer