kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14181 from hakman/hetzner_etcd-manager_ig 

Run etcd-manager with instance group name as volume name tag for Hetzner
This commit is contained in:
Kubernetes Prow Robot 2022-08-30 05:19:02 -07:00 committed by GitHub
parent a510712051 13f768f50b
commit 5710b1ef2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/model/components/etcdmanager/model.go
View File

@ -429,6 +429,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
fmt.Sprintf("%s=%s", hetzner.TagKubernetesClusterName, b.Cluster.Name),
fmt.Sprintf("%s=%s", hetzner.TagKubernetesVolumeRole, etcdCluster.Name),
}
config.VolumeNameTag = fmt.Sprintf("%s=%s", hetzner.TagKubernetesInstanceGroup, instanceGroupName)
case kops.CloudProviderOpenstack:
config.VolumeProvider = "openstack"

5
tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content
View File

@ -15,8 +15,9 @@ spec:
--backup-store=memfs://tests/minimal.k8s.local/backups/etcd/events --client-urls=https://__name__:4002
--cluster-name=etcd-events --containerized=true --dns-suffix=internal.minimal.k8s.local
--grpc-port=3997 --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
--v=6 --volume-provider=hetzner --volume-tag=kops.k8s.io/cluster=minimal.k8s.local
--volume-tag=kops.k8s.io/volume-role=events > /tmp/pipe 2>&1
--v=6 --volume-name-tag=kops.k8s.io/instance-group=master-fsn1 --volume-provider=hetzner
--volume-tag=kops.k8s.io/cluster=minimal.k8s.local --volume-tag=kops.k8s.io/volume-role=events
> /tmp/pipe 2>&1
env:
- name: HCLOUD_TOKEN
value: REDACTED

5
tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content
View File

@ -15,8 +15,9 @@ spec:
--backup-store=memfs://tests/minimal.k8s.local/backups/etcd/main --client-urls=https://__name__:4001
--cluster-name=etcd --containerized=true --dns-suffix=internal.minimal.k8s.local
--grpc-port=3996 --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
--v=6 --volume-provider=hetzner --volume-tag=kops.k8s.io/cluster=minimal.k8s.local
--volume-tag=kops.k8s.io/volume-role=main > /tmp/pipe 2>&1
--v=6 --volume-name-tag=kops.k8s.io/instance-group=master-fsn1 --volume-provider=hetzner
--volume-tag=kops.k8s.io/cluster=minimal.k8s.local --volume-tag=kops.k8s.io/volume-role=main
> /tmp/pipe 2>&1
env:
- name: HCLOUD_TOKEN
value: REDACTED