Skip to content

*: Drop tectonic-system namespace #682

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.

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
merged 3 commits into from
Nov 15, 2018

Conversation

wking
Copy link
Member

@wking wking commented Nov 15, 2018

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).

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 15, 2018
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2018
@abhinavdahiya
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2018
@abhinavdahiya
Copy link
Contributor

/lgtm cancel

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2018
@abhinavdahiya
Copy link
Contributor

@wking can you also drop role admin and role user both are not required anymore.

@sjenning
Copy link
Contributor

fyi metrics-server is being replaced with the prometheus metrics adapter anyway. i'm looking forward to this merging! big milestone.

@wking
Copy link
Member Author

wking commented Nov 15, 2018

... can you also drop role admin and role user both are not required anymore.

Dropped with 2ff4e5e -> af1d523. I'm going to reap CI to get some EIP headroom too.

@wking
Copy link
Member Author

wking commented Nov 15, 2018

Diff from my current ad6abd3 vs. #681:

 Gopkg.lock                                                           |   16 +--
 Gopkg.toml                                                           |    4 -
 docs/design/resource_dep.svg                                         | 1186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------
 docs/dev/libvirt-howto.md                                            |    2 +-
 pkg/asset/manifests/tectonic.go                                      |   23 +++-
 vendor/github.com/coreos/tectonic-config/LICENSE                     |  201 ---------------------------------
 vendor/github.com/coreos/tectonic-config/config/kube-addon/config.go |   23 ----
 vendor/k8s.io/apimachinery/pkg/util/rand/rand.go                     |  120 --------------------
 8 files changed, 693 insertions(+), 882 deletions(-)

I like the vendor, SVG, and doc differences. I'm not sure about:

diff --git a/pkg/asset/manifests/tectonic.go b/pkg/asset/manifests/tectonic.go
index b3c067a..b90ac5a 100644
--- a/pkg/asset/manifests/tectonic.go
+++ b/pkg/asset/manifests/tectonic.go
@@ -6,6 +6,7 @@ import (
 
        "github.com/aws/aws-sdk-go/aws/session"
        "github.com/ghodss/yaml"
+       "github.com/pkg/errors"
 
        "github.com/gophercloud/utils/openstack/clientconfig"
        "github.com/openshift/installer/pkg/asset"
@@ -20,12 +21,15 @@ const (
 )
 
 var (
+       tectonicConfigPath = filepath.Join(tectonicManifestDir, "00_cluster-config.yaml")
+
        _ asset.WritableAsset = (*Tectonic)(nil)
 )
 
 // Tectonic generates the dependent resource manifests for tectonic (as against bootkube)
 type Tectonic struct {
-       FileList []*asset.File
+       TectonicConfig *configurationObject
+       FileList       []*asset.File
 }
 
 // Name returns a human friendly name for the operator
@@ -145,6 +149,21 @@ func (t *Tectonic) Load(f asset.FileFetcher) (bool, error) {
                return false, nil
        }
 
-       t.FileList = fileList
+       tectonicConfig := &configurationObject{}
+       var found bool
+       for _, file := range fileList {
+               if file.Filename == tectonicConfigPath {
+                       if err := yaml.Unmarshal(file.Data, tectonicConfig); err != nil {
+                               return false, errors.Wrapf(err, "failed to unmarshal 00_cluster-config.yaml")
+                       }
+                       found = true
+               }
+       }
+
+       if !found {
+               return false, nil
+       }
+
+       t.FileList, t.TectonicConfig = fileList, tectonicConfig
        return true, nil
 }

Should I drop some/all of that, and if so, why?

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Nov 15, 2018

@wking we are not setting that field anymore, so can drop it.

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)
Generated with:

  $ openshift-install graph | dot -Tsvg >docs/design/resource_dep.svg

using:

  $ dot -V
  dot - graphviz version 2.30.1 (20170916.1124)
No longer needed since we dropped the tectonic-system namespace.
I edited Gopkg.toml by hand and then ran:

  $ dep ensure

using:

  $ dep version
  dep:
   version     : v0.5.0
   build date  :
   git hash    : 22125cf
   go version  : go1.10.3
   go compiler : gc
   platform    : linux/amd64
   features    : ImportDuringSolve=false
@wking
Copy link
Member Author

wking commented Nov 15, 2018

... we are not setting that field anymore, so need to drop it

Ok, dropped with ad6abd3 -> a14da04. We'll see if I've released enough EIPs...

@abhinavdahiya
Copy link
Contributor

i think we got all/most of what we could drop.
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [abhinavdahiya,wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants