Skip to content

Re-enable cluster ingress operator (remove from overriden set) #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 25, 2018
Merged

Re-enable cluster ingress operator (remove from overriden set) #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions pkg/asset/manifests/content/bootkube/02-ingress-namespace.go
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkg/asset/manifests/content/bootkube/cvo-overrides.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ overrides:
namespace: openshift-cluster-network-operator
name: cluster-network-operator
unmanaged: true
- kind: Deployment # this conflicts with tectonic-ingress-controller-operator
namespace: openshift-ingress-operator
name: ingress-operator
unmanaged: true
- kind: ServiceAccount # missing run level 0 on the namespace and has 0000_08
Copy link

@rajatchopra rajatchopra Oct 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to drop both the deployment for cluster-dns operator as well? As per comments in #415?

Copy link
Contributor Author

@ramr ramr Oct 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no only the deployment - the service account is for the cluster-dns-operator.

namespace: openshift-cluster-dns-operator
name: cluster-dns-operator
Expand Down
22 changes: 0 additions & 22 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-00-appversion.go
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-01-cluster-config.go
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-02-tls.go
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-03-pull.go
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-04-svc-account.go
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions pkg/asset/manifests/content/tectonic/tectonic-ingress-05-operator.go
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions pkg/asset/manifests/content/tectonic/tectonic-system-01-ca-cert.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
"etcd-service-endpoints.yaml": applyTemplateData(bootkube.EtcdServiceEndpointsKubeSystem, templateData),

"01-tectonic-namespace.yaml": []byte(bootkube.TectonicNamespace),
"02-ingress-namespace.yaml": []byte(bootkube.IngressNamespace),
"03-openshift-web-console-namespace.yaml": []byte(bootkube.OpenshiftWebConsoleNamespace),
"04-openshift-machine-config-operator.yaml": []byte(bootkube.OpenshiftMachineConfigOperator),
"05-openshift-cluster-api-namespace.yaml": []byte(bootkube.OpenshiftClusterAPINamespace),
Expand Down
23 changes: 3 additions & 20 deletions pkg/asset/manifests/tectonic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package manifests

import (
"bytes"
"encoding/base64"
"path/filepath"

Expand Down Expand Up @@ -53,24 +52,15 @@ func (t *Tectonic) Dependencies() []asset.Asset {
// Generate generates the respective operator config.yml files
func (t *Tectonic) Generate(dependencies asset.Parents) error {
installConfig := &installconfig.InstallConfig{}
ingressCertKey := &tls.IngressCertKey{}
kubeCA := &tls.KubeCA{}
clusterk8sio := &machines.ClusterK8sIO{}
worker := &machines.Worker{}
master := &machines.Master{}
addon := &kubeAddonOperator{}
dependencies.Get(installConfig, ingressCertKey, kubeCA, clusterk8sio, worker, master, addon)
dependencies.Get(installConfig, clusterk8sio, worker, master, addon)

templateData := &tectonicTemplateData{
IngressCaCert: base64.StdEncoding.EncodeToString(kubeCA.Cert()),
IngressKind: "haproxy-router",
IngressStatusPassword: installConfig.Config.Admin.Password, // FIXME: generate a new random one instead?
IngressTLSBundle: base64.StdEncoding.EncodeToString(bytes.Join([][]byte{ingressCertKey.Cert(), ingressCertKey.Key()}, []byte{})),
IngressTLSCert: base64.StdEncoding.EncodeToString(ingressCertKey.Cert()),
IngressTLSKey: base64.StdEncoding.EncodeToString(ingressCertKey.Key()),
KubeAddonOperatorImage: "quay.io/coreos/kube-addon-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
PullSecret: base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
TectonicIngressControllerOperatorImage: "quay.io/coreos/tectonic-ingress-controller-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
KubeAddonOperatorImage: "quay.io/coreos/kube-addon-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f",
PullSecret: base64.StdEncoding.EncodeToString([]byte(installConfig.Config.PullSecret)),
}

assetData := map[string][]byte{
Expand All @@ -84,14 +74,7 @@ func (t *Tectonic) Generate(dependencies asset.Parents) error {
"99_openshift-cluster-api_worker-user-data-secret.yaml": worker.UserDataSecretRaw,
"99_role-admin.yaml": []byte(content.RoleAdmin),
"99_role-user.yaml": []byte(content.RoleUser),
"99_tectonic-ingress-00-appversion.yaml": []byte(content.AppVersionTectonicIngress),
"99_tectonic-ingress-01-cluster-config.yaml": applyTemplateData(content.ClusterConfigTectonicIngress, templateData),
"99_tectonic-ingress-02-tls.yaml": applyTemplateData(content.TLSTectonicIngress, templateData),
"99_tectonic-ingress-03-pull.json": applyTemplateData(content.PullTectonicIngress, templateData),
"99_tectonic-ingress-04-svc-account.yaml": []byte(content.SvcAccountTectonicIngress),
"99_tectonic-ingress-05-operator.yaml": applyTemplateData(content.TectonicIngressControllerOperator, templateData),
"99_tectonic-system-00-binding-admin.yaml": []byte(content.BindingAdmin),
"99_tectonic-system-01-ca-cert.yaml": applyTemplateData(content.CaCertTectonicSystem, templateData),
"99_tectonic-system-02-pull.json": applyTemplateData(content.PullTectonicSystem, templateData),
}

Expand Down
11 changes: 2 additions & 9 deletions pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ type bootkubeTemplateData struct {
}

type tectonicTemplateData struct {
IngressCaCert string
IngressKind string
IngressStatusPassword string
IngressTLSBundle string
IngressTLSCert string
IngressTLSKey string
KubeAddonOperatorImage string
PullSecret string
TectonicIngressControllerOperatorImage string
KubeAddonOperatorImage string
PullSecret string
}