Skip to content

Commit ac11b74

Browse files
committed
*: Drop tectonic-system namespace
The kube-addon operator was the last remaining component in that namespace, and it was just controlling a metrics server. Metrics aren't critical to cluster functions, and dropping kube-addon means we don't need the old pull secret anymore (although we will shortly need new pull secrets for pulling private release images [1]). Also drop the admin and user roles [2], although I'm less clear on their connection. [1]: openshift#663 [2]: openshift#682 (comment)
1 parent 2507518 commit ac11b74

23 files changed

+7
-906
lines changed

data/data/bootstrap/files/usr/local/bin/tectonic.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ do
6565
echo "Done creating object from file: $file ..."
6666
done
6767

68-
# Wait for Tectonic pods
69-
wait_for_pods tectonic-system
70-
7168
# Workaround for https://github.com/opencontainers/runc/pull/1807
7269
touch /opt/tectonic/.tectonic.done
7370

data/data/manifests/bootkube/01-tectonic-namespace.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

data/data/manifests/bootkube/app-version-kind.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

data/data/manifests/tectonic/kube-addon-00-appversion.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

data/data/manifests/tectonic/kube-addon-01-operator.yaml.template

Lines changed: 0 additions & 51 deletions
This file was deleted.

data/data/manifests/tectonic/role-admin.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

data/data/manifests/tectonic/role-user.yaml

Lines changed: 0 additions & 67 deletions
This file was deleted.

data/data/manifests/tectonic/tectonic-system-00-binding-admin.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

data/data/manifests/tectonic/tectonic-system-02-pull.yaml.template

Lines changed: 0 additions & 12 deletions
This file was deleted.

docs/dev/libvirt-howto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ You'll need a `kubectl` binary on your path and [the kubeconfig from your `clust
286286
287287
```sh
288288
export KUBECONFIG="${DIR}/auth/kubeconfig"
289-
kubectl get -n tectonic-system pods
289+
kubectl get --all-namespaces pods
290290
```
291291
292292
Alternatively, you can run `kubectl` from the bootstrap or master nodes.

pkg/asset/manifests/kube-addon-operator.go

Lines changed: 0 additions & 80 deletions
This file was deleted.

pkg/asset/manifests/operators.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ func (m *Manifests) Dependencies() []asset.Asset {
7272
&bootkube.KubeSystemConfigmapRootCA{},
7373
&bootkube.KubeSystemSecretEtcdClient{},
7474

75-
&bootkube.TectonicNamespace{},
7675
&bootkube.OpenshiftWebConsoleNamespace{},
7776
&bootkube.OpenshiftMachineConfigOperator{},
7877
&bootkube.OpenshiftClusterAPINamespace{},
7978
&bootkube.OpenshiftServiceCertSignerNamespace{},
80-
&bootkube.AppVersionKind{},
8179
&bootkube.EtcdServiceKubeSystem{},
8280
}
8381
}
@@ -167,12 +165,10 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
167165
kubeSystemConfigmapRootCA := &bootkube.KubeSystemConfigmapRootCA{}
168166
kubeSystemSecretEtcdClient := &bootkube.KubeSystemSecretEtcdClient{}
169167

170-
tectonicNamespace := &bootkube.TectonicNamespace{}
171168
openshiftWebConsoleNamespace := &bootkube.OpenshiftWebConsoleNamespace{}
172169
openshiftMachineConfigOperator := &bootkube.OpenshiftMachineConfigOperator{}
173170
openshiftClusterAPINamespace := &bootkube.OpenshiftClusterAPINamespace{}
174171
openshiftServiceCertSignerNamespace := &bootkube.OpenshiftServiceCertSignerNamespace{}
175-
appVersionKind := &bootkube.AppVersionKind{}
176172
etcdServiceKubeSystem := &bootkube.EtcdServiceKubeSystem{}
177173
dependencies.Get(
178174
kubeCloudConfig,
@@ -185,12 +181,10 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
185181
kubeSystemConfigmapEtcdServingCA,
186182
kubeSystemConfigmapRootCA,
187183
kubeSystemSecretEtcdClient,
188-
tectonicNamespace,
189184
openshiftWebConsoleNamespace,
190185
openshiftMachineConfigOperator,
191186
openshiftClusterAPINamespace,
192187
openshiftServiceCertSignerNamespace,
193-
appVersionKind,
194188
etcdServiceKubeSystem,
195189
)
196190
assetData := map[string][]byte{
@@ -205,12 +199,10 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
205199
"kube-system-configmap-root-ca.yaml": applyTemplateData(kubeSystemConfigmapRootCA.Files()[0].Data, templateData),
206200
"kube-system-secret-etcd-client.yaml": applyTemplateData(kubeSystemSecretEtcdClient.Files()[0].Data, templateData),
207201

208-
"01-tectonic-namespace.yaml": []byte(tectonicNamespace.Files()[0].Data),
209202
"03-openshift-web-console-namespace.yaml": []byte(openshiftWebConsoleNamespace.Files()[0].Data),
210203
"04-openshift-machine-config-operator.yaml": []byte(openshiftMachineConfigOperator.Files()[0].Data),
211204
"05-openshift-cluster-api-namespace.yaml": []byte(openshiftClusterAPINamespace.Files()[0].Data),
212205
"09-openshift-service-signer-namespace.yaml": []byte(openshiftServiceCertSignerNamespace.Files()[0].Data),
213-
"app-version-kind.yaml": []byte(appVersionKind.Files()[0].Data),
214206
"etcd-service.yaml": []byte(etcdServiceKubeSystem.Files()[0].Data),
215207
}
216208

0 commit comments

Comments
 (0)