Skip to content
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

Split up the openshift image content to reduce total size. #19509

Merged
merged 26 commits into from
May 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f2afa3a
Remove node and origin images now that ansible is updated
smarterclayton Apr 25, 2018
57e7c6c
Remove origin-sti-build image and use origin-docker-build for both
smarterclayton Apr 25, 2018
4333db3
Move dependencies out of the base image and into children
smarterclayton Apr 25, 2018
99e9405
Create a new origin-cli image and reparent control-plane
smarterclayton Apr 25, 2018
b1b238a
Create a hyperkube and hypershift image and RPMs
smarterclayton Apr 25, 2018
c2a5349
Move a route helper into its own package
smarterclayton Apr 26, 2018
f992a14
UPSTREAM: 63169: Remove unnecessary dependencies on api/core/v1
smarterclayton Apr 26, 2018
fe56488
hack/deps was missing some dependencies in the chain
smarterclayton Apr 26, 2018
bec5885
Shared utility should not take a dependency on legacyscheme
smarterclayton Apr 26, 2018
e2c0242
Move kubeletclient reference out of an api package
smarterclayton Apr 26, 2018
f451bc0
Move admission config util to point of use package
smarterclayton Apr 26, 2018
74bb02b
Move references to kube-proxy out of interface packages
smarterclayton Apr 26, 2018
709bc6c
Simplify some node defaulting and remove call to master
smarterclayton Apr 26, 2018
6bdd01c
Build a shim binary that converts node-config.yaml to kubelet args
smarterclayton Apr 26, 2018
94e032a
Use the openshift/origin-cli|node images where appropriate
smarterclayton Apr 26, 2018
544e2bf
LDAP sync commands should only import LDAP validation
smarterclayton Apr 26, 2018
2583c15
Remove commands that require master and node validation
smarterclayton Apr 26, 2018
2b73820
Remove systemd units that are no longer referenced
smarterclayton Apr 26, 2018
1d1cc66
Move group coverage test after dependency orders changed
smarterclayton Apr 26, 2018
55f0162
UPSTREAM: 63177: kubectl takes a dependency on the controllers
smarterclayton Apr 26, 2018
47228f7
Remove an oc dependency on the RBAC server
smarterclayton Apr 26, 2018
7aac93a
Mark `oc export` deprecated and simplify what it does
smarterclayton Apr 26, 2018
267b534
Add an openshift/origin-tests image with the e2e suite
smarterclayton Apr 26, 2018
cef740e
Move openshift-node-config into the node image
smarterclayton Apr 26, 2018
cdaa6f8
Remove parts of oc status that depend on oc in node container
smarterclayton Apr 28, 2018
7b613e4
React to service catalog changes
smarterclayton May 2, 2018
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
64 changes: 64 additions & 0 deletions cmd/openshift-node-config/openshift-node-config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package main

import (
"fmt"
"math/rand"
"os"
"time"

"github.com/MakeNowJust/heredoc"
"github.com/ghodss/yaml"
"github.com/golang/glog"
"github.com/spf13/cobra"

"k8s.io/apiserver/pkg/util/logs"

"github.com/openshift/origin/pkg/cmd/flagtypes"
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
configapiv1 "github.com/openshift/origin/pkg/cmd/server/apis/config/v1"
"github.com/openshift/origin/pkg/cmd/server/origin/node"
)

func main() {
logs.InitLogs()
defer logs.FlushLogs()

rand.Seed(time.Now().UTC().UnixNano())

var configFile string

cmd := &cobra.Command{
Use: "openshift-node-config",
Long: heredoc.Doc(`
Generate Kubelet configuration from node-config.yaml

This command converts an existing OpenShift node configuration into the appropriate
Kubelet command-line flags.
`),
RunE: func(cmd *cobra.Command, args []string) error {
configapi.AddToScheme(configapi.Scheme)
configapiv1.AddToScheme(configapi.Scheme)

if len(configFile) == 0 {
return fmt.Errorf("you must specify a --config file to read")
}
nodeConfig, err := configapilatest.ReadAndResolveNodeConfig(configFile)
if err != nil {
return fmt.Errorf("unable to read node config: %v", err)
}
if glog.V(2) {
out, _ := yaml.Marshal(nodeConfig)
glog.V(2).Infof("Node config:\n%s", out)
}
return node.WriteKubeletFlags(*nodeConfig)
},
SilenceUsage: true,
}
cmd.Flags().StringVar(&configFile, "config", "", "The config file to convert to Kubelet arguments.")
flagtypes.GLog(cmd.PersistentFlags())

if err := cmd.Execute(); err != nil {
os.Exit(1)
}
}
177 changes: 2 additions & 175 deletions contrib/completions/bash/oc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading