From f50365f5d90140d39ac9e512e79f130faf67b932 Mon Sep 17 00:00:00 2001 From: Tim Ebert Date: Wed, 6 Sep 2023 12:23:03 +0200 Subject: [PATCH] Move shoot to project `timebertt` --- .../config/external-dns/patch-deployment.yaml | 2 +- .../config/policy/controlplane/etcd-main.yaml | 2 +- .../config/policy/controlplane/kube-apiserver-scale.yaml | 2 +- .../config/policy/controlplane/kube-apiserver.yaml | 2 +- .../config/policy/controlplane/kube-controller-manager.yaml | 2 +- .../tests/kube-apiserver-scale/kyverno-test.yaml | 2 +- .../controlplane/tests/kube-apiserver-scale/scale.yaml | 2 +- .../tests/kube-apiserver-scale/scale_expected.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-awake.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-awake_expected.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-hibernated.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-null.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-null_expected.yaml | 2 +- .../controlplane/tests/kube-apiserver/kyverno-test.yaml | 6 +++--- webhosting-operator/shoot.yaml | 6 ++---- webhosting-operator/skaffold.yaml | 6 +++--- 16 files changed, 21 insertions(+), 23 deletions(-) diff --git a/webhosting-operator/config/external-dns/patch-deployment.yaml b/webhosting-operator/config/external-dns/patch-deployment.yaml index 39b05b5b..9c165bda 100644 --- a/webhosting-operator/config/external-dns/patch-deployment.yaml +++ b/webhosting-operator/config/external-dns/patch-deployment.yaml @@ -18,7 +18,7 @@ spec: - --google-zone-visibility=public - --policy=sync - --registry=txt - - --txt-owner-id=timebertt-fb28d21f90-sharding + - --txt-owner-id=timebertt-sharding - --interval=1m env: - name: GOOGLE_APPLICATION_CREDENTIALS diff --git a/webhosting-operator/config/policy/controlplane/etcd-main.yaml b/webhosting-operator/config/policy/controlplane/etcd-main.yaml index 385d9459..2c442af3 100644 --- a/webhosting-operator/config/policy/controlplane/etcd-main.yaml +++ b/webhosting-operator/config/policy/controlplane/etcd-main.yaml @@ -2,7 +2,7 @@ apiVersion: kyverno.io/v1 kind: Policy metadata: name: etcd-main - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: failurePolicy: Ignore rules: diff --git a/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml b/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml index d36ddc77..9cb1348e 100644 --- a/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml +++ b/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml @@ -2,7 +2,7 @@ apiVersion: kyverno.io/v1 kind: Policy metadata: name: kube-apiserver-scale - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: failurePolicy: Ignore # schema validation doesn't seem to work in combination with the /scale subresource, disable it for now diff --git a/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml b/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml index 198c564a..af80d4f0 100644 --- a/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml +++ b/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml @@ -2,7 +2,7 @@ apiVersion: kyverno.io/v1 kind: Policy metadata: name: kube-apiserver - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: failurePolicy: Ignore rules: diff --git a/webhosting-operator/config/policy/controlplane/kube-controller-manager.yaml b/webhosting-operator/config/policy/controlplane/kube-controller-manager.yaml index 2e551951..9a0a0c78 100644 --- a/webhosting-operator/config/policy/controlplane/kube-controller-manager.yaml +++ b/webhosting-operator/config/policy/controlplane/kube-controller-manager.yaml @@ -2,7 +2,7 @@ apiVersion: kyverno.io/v1 kind: Policy metadata: name: kube-controller-manager - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: failurePolicy: Ignore rules: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/kyverno-test.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/kyverno-test.yaml index fbf1c55b..082fae81 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/kyverno-test.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/kyverno-test.yaml @@ -9,7 +9,7 @@ results: - policy: kube-apiserver-scale rule: replicas resource: kube-apiserver - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding kind: Scale result: pass patchedResource: scale_expected.yaml diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale.yaml index 8f219f9c..9a8da48c 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale.yaml @@ -2,6 +2,6 @@ kind: Scale apiVersion: autoscaling/v1 metadata: name: kube-apiserver - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 1 diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale_expected.yaml index 586e23fa..817f8bb9 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale/scale_expected.yaml @@ -2,6 +2,6 @@ kind: Scale apiVersion: autoscaling/v1 metadata: name: kube-apiserver - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 4 diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake.yaml index 8dcd138e..07c91f7b 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake.yaml @@ -5,7 +5,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver-awake - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 1 template: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml index a54e29d3..86097fee 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml @@ -5,7 +5,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver-awake - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 4 template: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-hibernated.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-hibernated.yaml index 04ea41fb..38727f81 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-hibernated.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-hibernated.yaml @@ -5,7 +5,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver-hibernated - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 0 template: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null.yaml index 9cb60263..eaa26cb2 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null.yaml @@ -5,7 +5,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver-null - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: template: spec: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml index 1ec8aeab..b61d5fa1 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml @@ -5,7 +5,7 @@ metadata: app: kubernetes role: apiserver name: kube-apiserver-null - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding spec: replicas: 4 template: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml index e7de2d2b..112dda1f 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml @@ -12,20 +12,20 @@ results: - policy: kube-apiserver rule: replicas resource: kube-apiserver-awake - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding kind: Deployment result: pass patchedResource: kube-apiserver-awake_expected.yaml - policy: kube-apiserver rule: replicas resource: kube-apiserver-null - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding kind: Deployment result: pass patchedResource: kube-apiserver-null_expected.yaml - policy: kube-apiserver rule: replicas resource: kube-apiserver-hibernated - namespace: shoot--fb28d21f90--sharding + namespace: shoot--timebertt--sharding kind: Deployment result: skip diff --git a/webhosting-operator/shoot.yaml b/webhosting-operator/shoot.yaml index 78d4d5c0..7fbf9d29 100644 --- a/webhosting-operator/shoot.yaml +++ b/webhosting-operator/shoot.yaml @@ -2,7 +2,7 @@ apiVersion: core.gardener.cloud/v1beta1 kind: Shoot metadata: name: sharding - namespace: garden-fb28d21f90-99b0e + namespace: garden-timebertt spec: addons: kubernetesDashboard: @@ -19,8 +19,6 @@ spec: location: Europe/Berlin kubernetes: enableStaticTokenKubeconfig: false - kubeAPIServer: - enableBasicAuthentication: false kubeControllerManager: nodeCIDRMaskSize: 20 kubeProxy: @@ -125,4 +123,4 @@ spec: - eu01-2 purpose: development region: RegionOne - secretBindingName: cq12kuc8ir + secretBindingName: timebertt diff --git a/webhosting-operator/skaffold.yaml b/webhosting-operator/skaffold.yaml index fc7ed193..e044b45f 100644 --- a/webhosting-operator/skaffold.yaml +++ b/webhosting-operator/skaffold.yaml @@ -36,7 +36,7 @@ deploy: profiles: - name: shoot activation: - - kubeContext: .*fb28d21f90-99b0e--sharding.* + - kubeContext: .*timebertt--sharding.* manifests: kustomize: paths: @@ -91,7 +91,7 @@ profiles: value: config/manager/shard - name: shoot activation: - - kubeContext: .*fb28d21f90-99b0e--sharding.* + - kubeContext: .*timebertt--sharding.* patches: - op: replace path: /manifests/kustomize/paths/0 @@ -192,7 +192,7 @@ deploy: profiles: - name: shoot activation: - - kubeContext: .*fb28d21f90-99b0e--sharding.* + - kubeContext: .*timebertt--sharding.* manifests: kustomize: paths: