summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml59
-rw-r--r--.copr/Makefile2
-rw-r--r--Makefile10
-rw-r--r--RELEASE_NOTES.md26
-rw-r--r--cmd/podman/cliconfig/config.go6
-rw-r--r--cmd/podman/commands.go3
-rw-r--r--cmd/podman/common.go2
-rw-r--r--cmd/podman/service.go154
-rw-r--r--cmd/podman/service_dummy.go11
-rw-r--r--cmd/podman/varlink.go2
-rw-r--r--cmd/service/main.go55
-rw-r--r--commands.md1
-rw-r--r--completions/bash/podman13
-rw-r--r--docs/source/Reference.rst2
-rw-r--r--docs/source/markdown/podman-create.1.md3
-rw-r--r--docs/source/markdown/podman-exec.1.md2
-rw-r--r--docs/source/markdown/podman-rmi.1.md2
-rw-r--r--docs/source/markdown/podman-run.1.md3
-rw-r--r--docs/source/markdown/podman-service.1.md47
-rw-r--r--docs/source/markdown/podman.1.md1
-rw-r--r--go.mod1
-rw-r--r--go.sum1
-rwxr-xr-xhack/release.sh15
-rw-r--r--libpod/container.go5
-rw-r--r--libpod/oci_conmon_linux.go13
-rw-r--r--libpod/options.go21
-rw-r--r--pkg/adapter/client.go2
-rw-r--r--pkg/adapter/client_config.go7
-rw-r--r--pkg/api/Makefile12
-rw-r--r--pkg/api/handlers/handler.go16
-rw-r--r--pkg/api/handlers/images.go17
-rw-r--r--pkg/api/handlers/images_build.go229
-rw-r--r--pkg/api/handlers/libpod/containers.go16
-rw-r--r--pkg/api/handlers/libpod/pods.go17
-rw-r--r--pkg/api/handlers/swagger.go4
-rw-r--r--pkg/api/handlers/utils/errors.go5
-rw-r--r--pkg/api/server/listener_api.go31
-rw-r--r--pkg/api/server/register_containers.go25
-rw-r--r--pkg/api/server/register_images.go217
-rw-r--r--pkg/api/server/register_pods.go3
-rw-r--r--pkg/api/server/server.go78
-rw-r--r--pkg/bindings/containers.go8
-rw-r--r--pkg/rootless/rootless_linux.c9
-rw-r--r--pkg/spec/namespaces.go4
-rw-r--r--pkg/spec/spec.go4
-rw-r--r--pkg/systemdgen/systemdgen.go5
-rw-r--r--pkg/systemdgen/systemdgen_test.go2
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml164
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml328
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml101
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml98
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml219
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml123
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml366
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml70
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml100
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml76
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml144
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml221
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml55
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml141
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml661
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml63
-rw-r--r--vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml88
-rw-r--r--vendor/github.com/openshift/api/config/v1/types.go2
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_apiserver.go43
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_authentication.go4
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_build.go14
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_cluster_operator.go72
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_cluster_version.go32
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_console.go9
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_dns.go7
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_feature.go120
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_image.go40
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_infrastructure.go39
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_ingress.go18
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_network.go27
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_operatorhub.go19
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_project.go7
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_proxy.go5
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_scheduling.go7
-rw-r--r--vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go260
-rw-r--r--vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go199
-rw-r--r--vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go306
-rw-r--r--vendor/modules.txt2
85 files changed, 4846 insertions, 575 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index fb6dd4cdb..e1810fab6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -514,6 +514,7 @@ special_testing_cgroupv2_task:
always:
<<: *standardlogs
+
special_testing_endpoint_task:
depends_on:
@@ -561,7 +562,8 @@ test_build_cache_images_task:
only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH &&
- $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*'
+ $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' &&
+ $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
depends_on:
- "gating"
@@ -593,7 +595,8 @@ verify_test_built_images_task:
only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH &&
- $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*'
+ $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' &&
+ $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
depends_on:
@@ -637,33 +640,38 @@ verify_test_built_images_task:
always:
<<: *standardlogs
-
-upload_snap_task:
-
- # Only when PR or branch is merged into master
- only_if: $CIRRUS_BRANCH == $DEST_BRANCH
-
- depends_on:
- - "test_building_snap"
-
- container:
- image: yakshaveinc/snapcraft:core18
-
- env:
- SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75]
- snapcraft_login_file:
- path: /root/.snapcraft/login.cfg
- variable_name: SNAPCRAFT_LOGIN
- snapcraft_script:
- - 'apt-get -y update'
- - 'snapcraft login --with "/root/.snapcraft/login.cfg"'
- - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge'
+ #upload_snap_task:
+ # only_if: >-
+ # $CIRRUS_BRANCH != $DEST_BRANCH &&
+ # $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
+ # $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
+ #
+ # # Only when PR or branch is merged into master
+ #
+ # depends_on:
+ # - "test_building_snap"
+ #
+ # container:
+ # image: yakshaveinc/snapcraft:core18
+ #
+ # env:
+ # SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75]
+ # snapcraft_login_file:
+ # path: /root/.snapcraft/login.cfg
+ # variable_name: SNAPCRAFT_LOGIN
+ # snapcraft_script:
+ # - 'apt-get -y update'
+ # - 'snapcraft login --with "/root/.snapcraft/login.cfg"'
+ # - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge'
docs_task:
- # Only run this for PRs on mention, but always run after merge
- only_if: $CIRRUS_CHANGE_MESSAGE =~ '.*CI:DOCS.*' || $CIRRUS_BRANCH == $DEST_BRANCH
+ # Only run this for PRs on mention, and after merge
+ only_if: >-
+ $CIRRUS_BRANCH == $DEST_BRANCH &&
+ $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
+ $CIRRUS_CHANGE_MESSAGE =~ '.*CI:DOCS.*'
depends_on:
- "gating"
@@ -697,7 +705,6 @@ success_task:
- "special_testing_endpoint"
- "test_build_cache_images"
- "test_building_snap"
- - "upload_snap"
- "verify_test_built_images"
- "docs"
diff --git a/.copr/Makefile b/.copr/Makefile
index 465a52b15..ff99cd5c6 100644
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -5,6 +5,8 @@ outdir := $(CURDIR)
topdir := $(CURDIR)/rpmbuild
SHORT_COMMIT ?= $(shell git rev-parse --short=8 HEAD)
+export GO111MODULE=off
+
srpm:
mkdir -p $(topdir)
sh $(current_dir)/prepare.sh
diff --git a/Makefile b/Makefile
index c794ffde7..a7e779dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -199,14 +199,6 @@ bin/podman.cross.%: .gopathok
GOARCH="$${TARGET##*.}" \
$(GO_BUILD) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman
-.PHONY: service
-service: .gopathok
- $(GO_BUILD) $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/service
-
-.PHONY:
-run-service:
- systemd-socket-activate -l 8080 ./bin/service
-
.PHONY: run-docker-py-tests
run-docker-py-tests:
$(eval testLogs=$(shell mktemp))
@@ -328,7 +320,7 @@ system.test-binary: .install.ginkgo
vagrant-check:
BOX=$(BOX) sh ./vagrant.sh
-binaries: varlink_generate podman podman-remote service ## Build podman
+binaries: varlink_generate podman podman-remote ## Build podman
install.catatonit:
./hack/install_catatonit.sh
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7864b9232..0ef3e4322 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,31 @@
# Release Notes
+## 1.7.1
+### Features
+- Rootless Podman now uses Rootlesskit for port forwarding, which should greatly improve performance and capabilities
+- The `podman untag` command has been added to remove tags from images without deleting them
+- The `podman service` command has been added to run an API server for managing Podman remotely
+- The `podman inspect` command on images now displays previous names they used
+- The `podman generate systemd` command now supports a `--new` option to generate service files that create and run new containers instead of managing existing containers
+- Support for `--log-opt tag=` to set logging tags has been added to the `journald` log driver
+- Added support for using Seccomp profiles embedded in images for `podman run` and `podman create` via the new `--seccomp-policy` CLI flag ([#4806](https://github.com/containers/libpod/pull/4806))
+
+### Bugfixes
+- Fixed a bug where the `podman cp` command would not copy the contents of directories when paths ending in `/.` were given ([#4717](https://github.com/containers/libpod/issues/4717))
+- Fixed a bug where the `podman play kube` command did not properly locate Seccomp profiles specified relative to localhost ([#4555](https://github.com/containers/libpod/issues/4555))
+- Fixed a bug where the `podman info` command for remote Podman did not show registry information ([#4793](https://github.com/containers/libpod/issues/4793))
+- Fixed a bug where the `podman exec` command did not support having input piped into it ([#3302](https://github.com/containers/libpod/issues/3302))
+- Fixed a bug where the `podman cp` command with rootless Podman on CGroups v2 systems did not properly determine if the container could be paused while copying ([#4813](https://github.com/containers/libpod/issues/4813))
+- Fixed a bug where the `podman container prune --force` command could possible remove running containers if they were started while the command was running ([#4844](https://github.com/containers/libpod/issues/4844))
+- Fixed a bug where Podman, when run as root, would not properly configure `slirp4netns` networking when requested ([#4853](https://github.com/containers/libpod/pull/4853))
+- Fixed a bug where `podman run --userns=keep-id` did not work when the user had a UID over 65535 ([#4838](https://github.com/containers/libpod/issues/4838))
+- Fixed a bug where rootless `podman run` and `podman create` with the `--userns=keep-id` option could change permissions on `/run/user/$UID` and break KDE ([#4846](https://github.com/containers/libpod/issues/4846))
+
+### Misc
+- Initial work on version 2 of the Podman remote API has been merged, but is still in an alpha state and not ready for use. Read more [here](https://podman.io/releases/2020/01/17/podman-new-api.html)
+- Updated vendored Buildah to v1.13.1
+- Updated vendored containers/storage to v1.15.5
+
## 1.7.0
### Features
- Added support for setting a static MAC address for containers
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index b261599e6..6bc8aa4a3 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -599,6 +599,12 @@ type VarlinkValues struct {
Timeout int64
}
+type ServiceValues struct {
+ PodmanCommand
+ Varlink bool
+ Timeout int64
+}
+
type SetTrustValues struct {
PodmanCommand
PolicyPath string
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 31f1b3ba4..ebd7aeb0c 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -26,6 +26,9 @@ func getMainCommands() []*cobra.Command {
if len(_varlinkCommand.Use) > 0 {
rootCommands = append(rootCommands, _varlinkCommand)
}
+ if len(_serviceCommand.Use) > 0 {
+ rootCommands = append(rootCommands, _serviceCommand)
+ }
return rootCommands
}
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 8690be64f..f3aff1d49 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -158,7 +158,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.String(
"cgroups", "enabled",
- "control container cgroup configuration",
+ `control container cgroup configuration ("enabled"|"disabled"|"no-conmon")`,
)
createFlags.String(
"cgroup-parent", "",
diff --git a/cmd/podman/service.go b/cmd/podman/service.go
new file mode 100644
index 000000000..6e2b4a366
--- /dev/null
+++ b/cmd/podman/service.go
@@ -0,0 +1,154 @@
+// +build varlink,!remoteclient
+
+package main
+
+import (
+ "fmt"
+ "net"
+ "os"
+ "path/filepath"
+ "strings"
+ "time"
+
+ "github.com/containers/libpod/cmd/podman/cliconfig"
+ "github.com/containers/libpod/cmd/podman/libpodruntime"
+ iopodman "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
+ "github.com/containers/libpod/pkg/adapter"
+ api "github.com/containers/libpod/pkg/api/server"
+ "github.com/containers/libpod/pkg/rootless"
+ "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/pkg/varlinkapi"
+ "github.com/containers/libpod/version"
+ "github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
+ "github.com/spf13/cobra"
+ "github.com/varlink/go/varlink"
+)
+
+var (
+ serviceCommand cliconfig.ServiceValues
+ serviceDescription = `Run an API service
+
+Enable a listening service for API access to Podman commands.
+`
+
+ _serviceCommand = &cobra.Command{
+ Use: "service [flags] [URI]",
+ Short: "Run API service",
+ Long: serviceDescription,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ serviceCommand.InputArgs = args
+ serviceCommand.GlobalFlags = MainGlobalOpts
+ return serviceCmd(&serviceCommand)
+ },
+ }
+)
+
+func init() {
+ serviceCommand.Command = _serviceCommand
+ serviceCommand.SetHelpTemplate(HelpTemplate())
+ serviceCommand.SetUsageTemplate(UsageTemplate())
+ flags := serviceCommand.Flags()
+ flags.Int64VarP(&serviceCommand.Timeout, "timeout", "t", 1000, "Time until the service session expires in milliseconds. Use 0 to disable the timeout")
+ flags.BoolVar(&serviceCommand.Varlink, "varlink", false, "Use legacy varlink service instead of REST")
+}
+
+func serviceCmd(c *cliconfig.ServiceValues) error {
+ // For V2, default to the REST socket
+ apiURI := adapter.DefaultAPIAddress
+ if c.Varlink {
+ apiURI = adapter.DefaultVarlinkAddress
+ }
+
+ if rootless.IsRootless() {
+ xdg, err := util.GetRuntimeDir()
+ if err != nil {
+ return err
+ }
+ socketName := "podman.sock"
+ if c.Varlink {
+ socketName = "io.podman"
+ }
+ socketDir := filepath.Join(xdg, "podman", socketName)
+ if _, err := os.Stat(filepath.Dir(socketDir)); err != nil {
+ if os.IsNotExist(err) {
+ if err := os.Mkdir(filepath.Dir(socketDir), 0755); err != nil {
+ return err
+ }
+ } else {
+ return err
+ }
+ }
+ apiURI = fmt.Sprintf("unix:%s", socketDir)
+ }
+
+ if len(c.InputArgs) > 0 {
+ apiURI = c.InputArgs[0]
+ }
+
+ logrus.Infof("using API endpoint: %s", apiURI)
+
+ // Create a single runtime api consumption
+ runtime, err := libpodruntime.GetRuntimeDisableFDs(getContext(), &c.PodmanCommand)
+ if err != nil {
+ return errors.Wrapf(err, "error creating libpod runtime")
+ }
+ defer runtime.DeferredShutdown(false)
+
+ timeout := time.Duration(c.Timeout) * time.Millisecond
+ if c.Varlink {
+ return runVarlink(runtime, apiURI, timeout, c)
+ }
+ return runREST(runtime, apiURI, timeout)
+}
+
+func runREST(r *libpod.Runtime, uri string, timeout time.Duration) error {
+ logrus.Warn("This function is EXPERIMENTAL")
+ fmt.Println("This function is EXPERIMENTAL.")
+ fields := strings.Split(uri, ":")
+ if len(fields) == 1 {
+ return errors.Errorf("%s is an invalid socket destination", uri)
+ }
+ address := strings.Join(fields[1:], ":")
+ l, err := net.Listen(fields[0], address)
+ if err != nil {
+ return errors.Wrapf(err, "unable to create socket %s", uri)
+ }
+ server, err := api.NewServerWithSettings(r, timeout, &l)
+ if err != nil {
+ return err
+ }
+ return server.Serve()
+}
+
+func runVarlink(r *libpod.Runtime, uri string, timeout time.Duration, c *cliconfig.ServiceValues) error {
+ var varlinkInterfaces = []*iopodman.VarlinkInterface{varlinkapi.New(&c.PodmanCommand, r)}
+ service, err := varlink.NewService(
+ "Atomic",
+ "podman",
+ version.Version,
+ "https://github.com/containers/libpod",
+ )
+ if err != nil {
+ return errors.Wrapf(err, "unable to create new varlink service")
+ }
+
+ for _, i := range varlinkInterfaces {
+ if err := service.RegisterInterface(i); err != nil {
+ return errors.Errorf("unable to register varlink interface %v", i)
+ }
+ }
+
+ // Run the varlink server at the given address
+ if err = service.Listen(uri, timeout); err != nil {
+ switch err.(type) {
+ case varlink.ServiceTimeoutError:
+ logrus.Infof("varlink service expired (use --timeout to increase session time beyond %d ms, 0 means never timeout)", timeout.String())
+ return nil
+ default:
+ return errors.Wrapf(err, "unable to start varlink service")
+ }
+ }
+ return nil
+}
diff --git a/cmd/podman/service_dummy.go b/cmd/podman/service_dummy.go
new file mode 100644
index 000000000..a774c34de
--- /dev/null
+++ b/cmd/podman/service_dummy.go
@@ -0,0 +1,11 @@
+// +build !varlink
+
+package main
+
+import "github.com/spf13/cobra"
+
+var (
+ _serviceCommand = &cobra.Command{
+ Use: "",
+ }
+)
diff --git a/cmd/podman/varlink.go b/cmd/podman/varlink.go
index cd21e3574..047d94fc2 100644
--- a/cmd/podman/varlink.go
+++ b/cmd/podman/varlink.go
@@ -51,7 +51,7 @@ func init() {
}
func varlinkCmd(c *cliconfig.VarlinkValues) error {
- varlinkURI := adapter.DefaultAddress
+ varlinkURI := adapter.DefaultVarlinkAddress
if rootless.IsRootless() {
xdg, err := util.GetRuntimeDir()
if err != nil {
diff --git a/cmd/service/main.go b/cmd/service/main.go
deleted file mode 100644
index 0290de892..000000000
--- a/cmd/service/main.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
- "context"
- "fmt"
- "os"
-
- "github.com/containers/libpod/cmd/podman/cliconfig"
- "github.com/containers/libpod/cmd/podman/libpodruntime"
- api "github.com/containers/libpod/pkg/api/server"
- "github.com/containers/storage/pkg/reexec"
- log "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-func initConfig() {
- // we can do more stuff in here.
-}
-
-func main() {
- if reexec.Init() {
- // We were invoked with a different argv[0] indicating that we
- // had a specific job to do as a subprocess, and it's done.
- return
- }
-
- cobra.OnInitialize(initConfig)
- log.SetLevel(log.DebugLevel)
-
- config := cliconfig.PodmanCommand{
- Command: &cobra.Command{},
- InputArgs: []string{},
- GlobalFlags: cliconfig.MainFlags{},
- Remote: false,
- }
- // Create a single runtime for http
- runtime, err := libpodruntime.GetRuntimeDisableFDs(context.Background(), &config)
- if err != nil {
- fmt.Printf("error creating libpod runtime: %s", err.Error())
- os.Exit(1)
- }
- defer runtime.DeferredShutdown(false)
-
- server, err := api.NewServer(runtime)
- if err != nil {
- fmt.Println(err.Error())
- os.Exit(1)
- }
-
- err = server.Serve()
- if err != nil {
- fmt.Println(err.Error())
- os.Exit(1)
- }
-}
diff --git a/commands.md b/commands.md
index b744b702e..17e069cb1 100644
--- a/commands.md
+++ b/commands.md
@@ -73,6 +73,7 @@
| [podman-rmi(1)](/docs/source/markdown/podman-rmi.1.md) | Removes one or more images |
| [podman-run(1)](/docs/source/markdown/podman-run.1.md) | Run a command in a container |
| [podman-save(1)](/docs/source/markdown/podman-save.1.md) | Saves an image to an archive |
+| [podman-service(1)](/docs/source/markdown/podman-service.1.md) | Run an API listening service |
| [podman-search(1)](/docs/source/markdown/podman-search.1.md) | Search a registry for an image |
| [podman-start(1)](/docs/source/markdown/podman-start.1.md) | Starts one or more containers |
| [podman-stats(1)](/docs/source/markdown/podman-stats.1.md) | Display a live stream of one or more containers' resource usage statistics |
diff --git a/completions/bash/podman b/completions/bash/podman
index ca3618b0b..57b9547a7 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -1755,6 +1755,19 @@ _podman_search() {
_complete_ "$options_with_args" "$boolean_options"
}
+_podman_service() {
+ local options_with_args="
+ -t
+ --timeout
+ "
+ local boolean_options="
+ --help
+ -h
+ --varlink
+ "
+ _complete_ "$options_with_args" "$boolean_options"
+}
+
_podman_unmount() {
_podman_umount $@
}
diff --git a/docs/source/Reference.rst b/docs/source/Reference.rst
index 8c0b4aca4..c6a131bc7 100644
--- a/docs/source/Reference.rst
+++ b/docs/source/Reference.rst
@@ -1,4 +1,4 @@
Reference
=========
-Check out our new `API documentation <api.html>`_
+Check out our new in-development `API documentation <_static/api.html>`_
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index 0236e30ba..7f0c2260c 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -78,8 +78,9 @@ If the host uses cgroups v1, the default is set to **host**. On cgroups v2 the
**--cgroups**=*mode*
Determines whether the container will create CGroups.
-Valid values are *enabled* and *disabled*, which the default being *enabled*.
+Valid values are *enabled*, *disabled*, *no-conmon*, which the default being *enabled*.
The *disabled* option will force the container to not create CGroups, and thus conflicts with CGroup options (**--cgroupns** and **--cgroup-parent**).
+The *no-conmon* option disables a new CGroup only for the conmon process.
**--cgroup-parent**=*path*
diff --git a/docs/source/markdown/podman-exec.1.md b/docs/source/markdown/podman-exec.1.md
index fc67211d1..8c0106d70 100644
--- a/docs/source/markdown/podman-exec.1.md
+++ b/docs/source/markdown/podman-exec.1.md
@@ -105,9 +105,11 @@ non-zero code, the exit codes follow the `chroot` standard, see below:
## EXAMPLES
+```
$ podman exec -it ctrID ls
$ podman exec -it -w /tmp myCtr pwd
$ podman exec --user root ctrID ls
+```
## SEE ALSO
podman(1), podman-run(1)
diff --git a/docs/source/markdown/podman-rmi.1.md b/docs/source/markdown/podman-rmi.1.md
index d911ee6cb..3c46bc32c 100644
--- a/docs/source/markdown/podman-rmi.1.md
+++ b/docs/source/markdown/podman-rmi.1.md
@@ -29,7 +29,7 @@ podman rmi c0ed59d05ff7
Remove an image and its associated containers.
```
podman rmi --force imageID
-````
+```
Remove multiple images by their shortened IDs.
```
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index f613e6668..2b1452b53 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -92,8 +92,9 @@ If the host uses cgroups v1, the default is set to **host**. On cgroups v2 the
**--cgroups**=*mode*
Determines whether the container will create CGroups.
-Valid values are *enabled* and *disabled*, which the default being *enabled*.
+Valid values are *enabled*, *disabled*, *no-conmon*, which the default being *enabled*.
The *disabled* option will force the container to not create CGroups, and thus conflicts with CGroup options (**--cgroupns** and **--cgroup-parent**).
+The *no-conmon* option disables a new CGroup only for the conmon process.
**--cgroup-parent**=*cgroup*
diff --git a/docs/source/markdown/podman-service.1.md b/docs/source/markdown/podman-service.1.md
new file mode 100644
index 000000000..5c55e20d3
--- /dev/null
+++ b/docs/source/markdown/podman-service.1.md
@@ -0,0 +1,47 @@
+% podman-service(1)
+
+## NAME
+podman\-service - Run an API service
+
+## SYNOPSIS
+**podman service** [*options*]
+
+## DESCRIPTION
+The **podman service** command creates a listening service that will answer API calls for Podman. You may
+optionally provide an endpoint for the API in URI form. For example, *unix://tmp/foobar.sock* or *tcp:localhost:8080*.
+If no endpoint is provided, defaults will be used. The default endpoint for a rootfull
+service is *unix:/run/podman/podman.sock* and rootless is *unix:/$XDG_RUNTIME_DIR/podman/podman.sock* (for
+example *unix:/run/user/1000/podman/podman.sock*)
+
+## OPTIONS
+
+**--timeout**, **-t**
+
+The time until the session expires in _milliseconds_. The default is 1
+second. A value of `0` means no timeout and the session will not expire.
+
+**--varlink**
+
+Use the varlink protocol instead of the REST-based protocol. This option will be deprecated in the future.
+
+**--help**, **-h**
+
+Print usage statement.
+
+## EXAMPLES
+
+Run an API listening for 5 seconds using the default socket.
+```
+podman service --timeout 5000
+```
+
+Run the podman varlink service with an alternate URI and accept the default timeout.
+```
+$ podman service --varlink unix:/tmp/io.podman
+```
+
+## SEE ALSO
+podman(1), podman-varlink(1)
+
+## HISTORY
+January 2020, Originally compiled by Brent Baude<bbaude@redhat.com>
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 0c9ec3d1c..6e0eff045 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -191,6 +191,7 @@ the exit codes follow the `chroot` standard, see below:
| [podman-rmi(1)](podman-rmi.1.md) | Removes one or more locally stored images. |
| [podman-run(1)](podman-run.1.md) | Run a command in a new container. |
| [podman-save(1)](podman-save.1.md) | Save an image to a container archive. |
+| [podman-service(1)](podman-service.1.md) | Run an API service |
| [podman-search(1)](podman-search.1.md) | Search a registry for an image. |
| [podman-start(1)](podman-start.1.md) | Start one or more containers. |
| [podman-stats(1)](podman-stats.1.md) | Display a live stream of one or more container's resource usage statistics. |
diff --git a/go.mod b/go.mod
index 1f89eb89f..54af7fda4 100644
--- a/go.mod
+++ b/go.mod
@@ -50,7 +50,6 @@ require (
github.com/opencontainers/runtime-spec v0.1.2-0.20190618234442-a950415649c7
github.com/opencontainers/runtime-tools v0.9.0
github.com/opencontainers/selinux v1.3.0
- github.com/openshift/api v3.9.1-0.20190810003144-27fb16909b15+incompatible // indirect
github.com/opentracing/opentracing-go v1.1.0
github.com/pkg/errors v0.9.0
github.com/pkg/profile v1.4.0 // indirect
diff --git a/go.sum b/go.sum
index f1d6f1c78..de7791f47 100644
--- a/go.sum
+++ b/go.sum
@@ -391,6 +391,7 @@ github.com/opencontainers/selinux v1.2.2 h1:Kx9J6eDG5/24A6DtUquGSpJQ+m2MUTahn4Ft
github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
github.com/opencontainers/selinux v1.3.0 h1:xsI95WzPZu5exzA6JzkLSfdr/DilzOhCJOqGe5TgR0g=
github.com/opencontainers/selinux v1.3.0/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
+github.com/openshift/api v0.0.0-20200106203948-7ab22a2c8316 h1:enQG2QUGwug4fR1yM6hL0Fjzx6Km/exZY6RbSPwMu3o=
github.com/openshift/api v0.0.0-20200106203948-7ab22a2c8316/go.mod h1:dv+J0b/HWai0QnMVb37/H0v36klkLBi2TNpPeWDxX10=
github.com/openshift/api v3.9.1-0.20190810003144-27fb16909b15+incompatible h1:s55wx8JIG/CKnewev892HifTBrtKzMdvgB3rm4rxC2s=
github.com/openshift/api v3.9.1-0.20190810003144-27fb16909b15+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
diff --git a/hack/release.sh b/hack/release.sh
index 56a853347..7c22aed42 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -36,12 +36,6 @@ write_spec_version()
sed -i "s/^\(Version: *\).*/\1${LOCAL_VERSION}/" contrib/spec/podman.spec.in
}
-write_makefile_epoch()
-{
- LOCAL_EPOCH="$1"
- sed -i "s/^\(EPOCH_TEST_COMMIT ?= \).*/\1${LOCAL_EPOCH}/" Makefile
-}
-
write_changelog()
{
echo "- Changelog for v${VERSION} (${DATE})" >.changelog.txt &&
@@ -66,17 +60,8 @@ dev_version_commit()
git commit -asm "Bump to v${NEXT_VERSION}-dev"
}
-epoch_commit()
-{
- LOCAL_EPOCH="$1"
- write_makefile_epoch "${LOCAL_EPOCH}" &&
- git commit -asm 'Bump gitvalidation epoch'
-}
-
git fetch origin &&
git checkout -b "bump-${VERSION}" origin/master &&
-EPOCH=$(git rev-parse HEAD) &&
release_commit &&
git tag -s -m "version ${VERSION}" "v${VERSION}" &&
dev_version_commit &&
-epoch_commit "${EPOCH}"
diff --git a/libpod/container.go b/libpod/container.go
index b3cb6334a..f29cebf20 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -373,8 +373,11 @@ type ContainerConfig struct {
// Time container was created
CreatedTime time.Time `json:"createdTime"`
// NoCgroups indicates that the container will not create CGroups. It is
- // incompatible with CgroupParent.
+ // incompatible with CgroupParent. Deprecated in favor of CgroupsMode.
NoCgroups bool `json:"noCgroups,omitempty"`
+ // CgroupsMode indicates how the container will create cgroups
+ // (disabled, no-conmon, enabled). It supersedes NoCgroups.
+ CgroupsMode string `json:"cgroupsMode,omitempty"`
// Cgroup parent of the container
CgroupParent string `json:"cgroupParent"`
// LogPath log location
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 0e8a64865..722012386 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1425,11 +1425,22 @@ func startCommandGivenSelinux(cmd *exec.Cmd) error {
// it then signals for conmon to start by sending nonse data down the start fd
func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec.Cmd, startFd *os.File) error {
mustCreateCgroup := true
- // If cgroup creation is disabled - just signal.
+
if ctr.config.NoCgroups {
mustCreateCgroup = false
}
+ // If cgroup creation is disabled - just signal.
+ switch ctr.config.CgroupsMode {
+ case "disabled", "no-conmon":
+ mustCreateCgroup = false
+ }
+
+ // $INVOCATION_ID is set by systemd when running as a service.
+ if os.Getenv("INVOCATION_ID") != "" {
+ mustCreateCgroup = false
+ }
+
if mustCreateCgroup {
cgroupParent := ctr.CgroupParent()
if r.cgroupManager == define.SystemdCgroupsManager {
diff --git a/libpod/options.go b/libpod/options.go
index 8bc5a541d..593037382 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1078,25 +1078,26 @@ func WithLogTag(tag string) CtrCreateOption {
}
-// WithNoCgroups disables the creation of CGroups for the new container.
-func WithNoCgroups() CtrCreateOption {
+// WithCgroupsMode disables the creation of CGroups for the conmon process.
+func WithCgroupsMode(mode string) CtrCreateOption {
return func(ctr *Container) error {
if ctr.valid {
return define.ErrCtrFinalized
}
- if ctr.config.CgroupParent != "" {
- return errors.Wrapf(define.ErrInvalidArg, "NoCgroups conflicts with CgroupParent")
- }
-
- if ctr.config.PIDNsCtr != "" {
- return errors.Wrapf(define.ErrInvalidArg, "NoCgroups requires a private PID namespace and cannot be used when PID namespace is shared with another container")
+ switch mode {
+ case "disabled":
+ ctr.config.NoCgroups = true
+ ctr.config.CgroupsMode = mode
+ case "enabled", "no-conmon":
+ ctr.config.CgroupsMode = mode
+ default:
+ return errors.Wrapf(define.ErrInvalidArg, "Invalid cgroup mode %q", mode)
}
- ctr.config.NoCgroups = true
-
return nil
}
+
}
// WithCgroupParent sets the Cgroup Parent of the new container.
diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go
index da4670892..5774ebe72 100644
--- a/pkg/adapter/client.go
+++ b/pkg/adapter/client.go
@@ -57,7 +57,7 @@ func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) {
// last resort is to make a socket connection with the default varlink address for root user
} else {
logrus.Debug("creating a varlink address based default root address")
- remoteEndpoint, err = newSocketConnection(DefaultAddress)
+ remoteEndpoint, err = newSocketConnection(DefaultVarlinkAddress)
}
return
}
diff --git a/pkg/adapter/client_config.go b/pkg/adapter/client_config.go
index 3559b16e3..8187b03b1 100644
--- a/pkg/adapter/client_config.go
+++ b/pkg/adapter/client_config.go
@@ -1,7 +1,10 @@
package adapter
-// DefaultAddress is the default address of the varlink socket
-const DefaultAddress = "unix:/run/podman/io.podman"
+// DefaultAPIAddress is the default address of the REST socket
+const DefaultAPIAddress = "unix:/run/podman/podman.sock"
+
+// DefaultVarlinkAddress is the default address of the varlink socket
+const DefaultVarlinkAddress = "unix:/run/podman/io.podman"
// EndpointType declares the type of server connection
type EndpointType int
diff --git a/pkg/api/Makefile b/pkg/api/Makefile
index 3d70376df..915f0b9b3 100644
--- a/pkg/api/Makefile
+++ b/pkg/api/Makefile
@@ -1,5 +1,13 @@
+export GO111MODULE=off
+
SWAGGER_OUT ?= swagger.yaml
-swagger:
+.PHONY: ${SWAGGER_OUT}
+${SWAGGER_OUT}:
+ # generate doesn't remove file on error
+ rm -f ${SWAGGER_OUT}
swagger generate spec -o ${SWAGGER_OUT} -w ./
- cat tags.yaml >> swagger.yaml
+
+# TODO: when pass validation move it under swagger.
+validate:
+ swagger validate ${SWAGGER_OUT}
diff --git a/pkg/api/handlers/handler.go b/pkg/api/handlers/handler.go
index 2efeb1379..4f303f6ab 100644
--- a/pkg/api/handlers/handler.go
+++ b/pkg/api/handlers/handler.go
@@ -36,11 +36,11 @@ func getRuntime(r *http.Request) *libpod.Runtime {
return r.Context().Value("runtime").(*libpod.Runtime)
}
-func getHeader(r *http.Request, k string) string {
- return r.Header.Get(k)
-}
-
-func hasHeader(r *http.Request, k string) bool {
- _, found := r.Header[k]
- return found
-}
+// func getHeader(r *http.Request, k string) string {
+// return r.Header.Get(k)
+// }
+//
+// func hasHeader(r *http.Request, k string) bool {
+// _, found := r.Header[k]
+// return found
+// }
diff --git a/pkg/api/handlers/images.go b/pkg/api/handlers/images.go
index d4cddbfb2..b4acdc312 100644
--- a/pkg/api/handlers/images.go
+++ b/pkg/api/handlers/images.go
@@ -74,8 +74,25 @@ func TagImage(w http.ResponseWriter, r *http.Request) {
}
func RemoveImage(w http.ResponseWriter, r *http.Request) {
+ decoder := r.Context().Value("decoder").(*schema.Decoder)
runtime := r.Context().Value("runtime").(*libpod.Runtime)
+ query := struct {
+ noPrune bool
+ }{
+ // This is where you can override the golang default value for one of fields
+ }
+
+ if err := decoder.Decode(&query, r.URL.Query()); err != nil {
+ utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
+ return
+ }
+ muxVars := mux.Vars(r)
+ if _, found := muxVars["noprune"]; found {
+ if query.noPrune {
+ utils.UnSupportedParameter("noprune")
+ }
+ }
name := mux.Vars(r)["name"]
newImage, err := runtime.ImageRuntime().NewFromLocal(name)
if err != nil {
diff --git a/pkg/api/handlers/images_build.go b/pkg/api/handlers/images_build.go
index c7c746392..b29c45574 100644
--- a/pkg/api/handlers/images_build.go
+++ b/pkg/api/handlers/images_build.go
@@ -1,6 +1,7 @@
package handlers
import (
+ "bytes"
"encoding/base64"
"encoding/json"
"fmt"
@@ -9,58 +10,66 @@ import (
"net/http"
"os"
"path/filepath"
+ "strconv"
"strings"
"github.com/containers/buildah"
"github.com/containers/buildah/imagebuildah"
"github.com/containers/libpod/pkg/api/handlers/utils"
"github.com/containers/storage/pkg/archive"
- log "github.com/sirupsen/logrus"
+ "github.com/gorilla/mux"
)
func BuildImage(w http.ResponseWriter, r *http.Request) {
authConfigs := map[string]AuthConfig{}
- if hasHeader(r, "X-Registry-Config") {
- registryHeader := getHeader(r, "X-Registry-Config")
- authConfigsJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(registryHeader))
+ if hdr, found := r.Header["X-Registry-Config"]; found && len(hdr) > 0 {
+ authConfigsJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(hdr[0]))
if json.NewDecoder(authConfigsJSON).Decode(&authConfigs) != nil {
- utils.BadRequest(w, "X-Registry-Config", registryHeader, json.NewDecoder(authConfigsJSON).Decode(&authConfigs))
+ utils.BadRequest(w, "X-Registry-Config", hdr[0], json.NewDecoder(authConfigsJSON).Decode(&authConfigs))
return
}
}
+ if hdr, found := r.Header["Content-Type"]; found && len(hdr) > 0 {
+ if hdr[0] != "application/x-tar" {
+ utils.BadRequest(w, "Content-Type", hdr[0],
+ fmt.Errorf("Content-Type: %s is not supported. Should be \"application/x-tar\"", hdr[0]))
+ }
+ }
+
anchorDir, err := extractTarFile(r, w)
if err != nil {
utils.InternalServerError(w, err)
return
}
- // defer os.RemoveAll(anchorDir)
+ defer os.RemoveAll(anchorDir)
query := struct {
- Dockerfile string `json:"dockerfile"`
- Tag string `json:"t"`
- ExtraHosts string `json:"extrahosts"`
- Remote string `json:"remote"`
- Quiet bool `json:"q"`
- NoCache bool `json:"nocache"`
- CacheFrom string `json:"cachefrom"`
- Pull string `json:"pull"`
- Rm bool `json:"rm"`
- ForceRm bool `json:"forcerm"`
- Memory int `json:"memory"`
- MemSwap int `json:"memswap"`
- CpuShares int `json:"cpushares"`
- CpuSetCpus string `json:"cpusetcpus"`
- CpuPeriod int `json:"cpuperiod"`
- CpuQuota int `json:"cpuquota"`
- BuildArgs string `json:"buildargs"`
- ShmSize int `json:"shmsize"`
- Squash bool `json:"squash"`
- Labels string `json:"labels"`
- NetworkMode string `json:"networkmode"`
- Platform string `json:"platform"`
- Target string `json:"target"`
- Outputs string `json:"outputs"`
+ Dockerfile string `schema:"dockerfile"`
+ Tag string `schema:"t"`
+ ExtraHosts string `schema:"extrahosts"`
+ Remote string `schema:"remote"`
+ Quiet bool `schema:"q"`
+ NoCache bool `schema:"nocache"`
+ CacheFrom string `schema:"cachefrom"`
+ Pull bool `schema:"pull"`
+ Rm bool `schema:"rm"`
+ ForceRm bool `schema:"forcerm"`
+ Memory int64 `schema:"memory"`
+ MemSwap int64 `schema:"memswap"`
+ CpuShares uint64 `schema:"cpushares"`
+ CpuSetCpus string `schema:"cpusetcpus"`
+ CpuPeriod uint64 `schema:"cpuperiod"`
+ CpuQuota int64 `schema:"cpuquota"`
+ BuildArgs string `schema:"buildargs"`
+ ShmSize int `schema:"shmsize"`
+ Squash bool `schema:"squash"`
+ Labels string `schema:"labels"`
+ NetworkMode string `schema:"networkmode"`
+ Platform string `schema:"platform"`
+ Target string `schema:"target"`
+ Outputs string `schema:"outputs"`
+ Registry string `schema:"registry"`
}{
Dockerfile: "Dockerfile",
Tag: "",
@@ -69,7 +78,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Quiet: false,
NoCache: false,
CacheFrom: "",
- Pull: "",
+ Pull: false,
Rm: true,
ForceRm: false,
Memory: 0,
@@ -86,6 +95,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Platform: "",
Target: "",
Outputs: "",
+ Registry: "docker.io",
}
if err := decodeQuery(r, &query); err != nil {
@@ -93,80 +103,121 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
return
}
- // Tag is the name with optional tag...
- var name = query.Tag
- var tag string
+ var (
+ // Tag is the name with optional tag...
+ name = query.Tag
+ tag = "latest"
+ )
if strings.Contains(query.Tag, ":") {
tokens := strings.SplitN(query.Tag, ":", 2)
name = tokens[0]
tag = tokens[1]
}
+ if t, found := mux.Vars(r)["target"]; found {
+ name = t
+ }
+
var buildArgs = map[string]string{}
- if found := hasVar(r, "buildargs"); found {
- if err := json.Unmarshal([]byte(query.BuildArgs), &buildArgs); err != nil {
- utils.BadRequest(w, "buildargs", query.BuildArgs, err)
+ if a, found := mux.Vars(r)["buildargs"]; found {
+ if err := json.Unmarshal([]byte(a), &buildArgs); err != nil {
+ utils.BadRequest(w, "buildargs", a, err)
return
}
}
// convert label formats
var labels = []string{}
- if hasVar(r, "labels") {
+ if l, found := mux.Vars(r)["labels"]; found {
var m = map[string]string{}
- if err := json.Unmarshal([]byte(query.Labels), &m); err != nil {
- utils.BadRequest(w, "labels", query.Labels, err)
+ if err := json.Unmarshal([]byte(l), &m); err != nil {
+ utils.BadRequest(w, "labels", l, err)
return
}
for k, v := range m {
- labels = append(labels, fmt.Sprintf("%s=%v", k, v))
+ labels = append(labels, k+"="+v)
+ }
+ }
+
+ pullPolicy := buildah.PullIfMissing
+ if _, found := mux.Vars(r)["pull"]; found {
+ if query.Pull {
+ pullPolicy = buildah.PullAlways
}
}
+ // build events will be recorded here
+ var (
+ buildEvents = []string{}
+ progress = bytes.Buffer{}
+ )
+
buildOptions := imagebuildah.BuildOptions{
ContextDirectory: filepath.Join(anchorDir, "build"),
- PullPolicy: 0,
- Registry: "",
- IgnoreUnrecognizedInstructions: false,
+ PullPolicy: pullPolicy,
+ Registry: query.Registry,
+ IgnoreUnrecognizedInstructions: true,
Quiet: query.Quiet,
- Isolation: 0,
+ Isolation: buildah.IsolationChroot,
Runtime: "",
RuntimeArgs: nil,
TransientMounts: nil,
- Compression: 0,
+ Compression: archive.Gzip,
Args: buildArgs,
Output: name,
AdditionalTags: []string{tag},
- Log: nil,
- In: nil,
- Out: nil,
- Err: nil,
- SignaturePolicyPath: "",
- ReportWriter: nil,
- OutputFormat: "",
- SystemContext: nil,
- NamespaceOptions: nil,
- ConfigureNetwork: 0,
- CNIPluginPath: "",
- CNIConfigDir: "",
- IDMappingOptions: nil,
- AddCapabilities: nil,
- DropCapabilities: nil,
- CommonBuildOpts: &buildah.CommonBuildOptions{},
- DefaultMountsFilePath: "",
- IIDFile: "",
- Squash: query.Squash,
- Labels: labels,
- Annotations: nil,
- OnBuild: nil,
- Layers: false,
- NoCache: query.NoCache,
- RemoveIntermediateCtrs: query.Rm,
- ForceRmIntermediateCtrs: query.ForceRm,
- BlobDirectory: "",
- Target: query.Target,
- Devices: nil,
+ Log: func(format string, args ...interface{}) {
+ buildEvents = append(buildEvents, fmt.Sprintf(format, args...))
+ },
+ In: nil,
+ Out: &progress,
+ Err: &progress,
+ SignaturePolicyPath: "",
+ ReportWriter: &progress,
+ OutputFormat: buildah.Dockerv2ImageManifest,
+ SystemContext: nil,
+ NamespaceOptions: nil,
+ ConfigureNetwork: 0,
+ CNIPluginPath: "",
+ CNIConfigDir: "",
+ IDMappingOptions: nil,
+ AddCapabilities: nil,
+ DropCapabilities: nil,
+ CommonBuildOpts: &buildah.CommonBuildOptions{
+ AddHost: nil,
+ CgroupParent: "",
+ CPUPeriod: query.CpuPeriod,
+ CPUQuota: query.CpuQuota,
+ CPUShares: query.CpuShares,
+ CPUSetCPUs: query.CpuSetCpus,
+ CPUSetMems: "",
+ HTTPProxy: false,
+ Memory: query.Memory,
+ DNSSearch: nil,
+ DNSServers: nil,
+ DNSOptions: nil,
+ MemorySwap: query.MemSwap,
+ LabelOpts: nil,
+ SeccompProfilePath: "",
+ ApparmorProfile: "",
+ ShmSize: strconv.Itoa(query.ShmSize),
+ Ulimit: nil,
+ Volumes: nil,
+ },
+ DefaultMountsFilePath: "",
+ IIDFile: "",
+ Squash: query.Squash,
+ Labels: labels,
+ Annotations: nil,
+ OnBuild: nil,
+ Layers: false,
+ NoCache: query.NoCache,
+ RemoveIntermediateCtrs: query.Rm,
+ ForceRmIntermediateCtrs: query.ForceRm,
+ BlobDirectory: "",
+ Target: query.Target,
+ Devices: nil,
}
id, _, err := getRuntime(r).Build(r.Context(), buildOptions, query.Dockerfile)
@@ -179,17 +230,13 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
struct {
Stream string `json:"stream"`
}{
- Stream: fmt.Sprintf("Successfully built %s\n", id),
+ Stream: progress.String() + "\n" +
+ strings.Join(buildEvents, "\n") +
+ fmt.Sprintf("\nSuccessfully built %s\n", id),
})
}
func extractTarFile(r *http.Request, w http.ResponseWriter) (string, error) {
- var (
- // length int64
- // n int64
- copyErr error
- )
-
// build a home for the request body
anchorDir, err := ioutil.TempDir("", "libpod_builder")
if err != nil {
@@ -204,26 +251,14 @@ func extractTarFile(r *http.Request, w http.ResponseWriter) (string, error) {
}
defer tarBall.Close()
- // if hasHeader(r, "Content-Length") {
- // length, err := strconv.ParseInt(getHeader(r, "Content-Length"), 10, 64)
- // if err != nil {
- // return "", errors.New(fmt.Sprintf("Failed request: unable to parse Content-Length of '%s'", getHeader(r, "Content-Length")))
- // }
- // n, copyErr = io.CopyN(tarBall, r.Body, length+1)
- // } else {
- _, copyErr = io.Copy(tarBall, r.Body)
- // }
+ // Content-Length not used as too many existing API clients didn't honor it
+ _, err = io.Copy(tarBall, r.Body)
r.Body.Close()
- if copyErr != nil {
+ if err != nil {
utils.InternalServerError(w,
fmt.Errorf("failed Request: Unable to copy tar file from request body %s", r.RequestURI))
}
- log.Debugf("Content-Length: %s", getVar(r, "Content-Length"))
-
- // if hasHeader(r, "Content-Length") && n != length {
- // return "", errors.New(fmt.Sprintf("Failed request: Given Content-Length does not match file size %d != %d", n, length))
- // }
_, _ = tarBall.Seek(0, 0)
if err := archive.Untar(tarBall, buildDir, &archive.TarOptions{}); err != nil {
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 388be24b6..e16a4ea1f 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -143,6 +143,22 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
}
+func UnmountContainer(w http.ResponseWriter, r *http.Request) {
+ runtime := r.Context().Value("runtime").(*libpod.Runtime)
+ name := mux.Vars(r)["name"]
+ conn, err := runtime.LookupContainer(name)
+ if err != nil {
+ utils.ContainerNotFound(w, name, err)
+ return
+ }
+ // TODO In future it might be an improvement that libpod unmount return a
+ // "container not mounted" error so we can surface that to the endpoint user
+ if err := conn.Unmount(false); err != nil {
+ utils.InternalServerError(w, err)
+ }
+ utils.WriteResponse(w, http.StatusNoContent, "")
+
+}
func MountContainer(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime)
name := mux.Vars(r)["name"]
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index daaf9d018..14f8e8de7 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -12,6 +12,7 @@ import (
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/api/handlers"
"github.com/containers/libpod/pkg/api/handlers/utils"
+ "github.com/containers/libpod/pkg/util"
"github.com/gorilla/mux"
"github.com/gorilla/schema"
"github.com/pkg/errors"
@@ -384,18 +385,27 @@ func PodKill(w http.ResponseWriter, r *http.Request) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)
decoder = r.Context().Value("decoder").(*schema.Decoder)
+ signal = "SIGKILL"
)
query := struct {
- signal int `schema:"signal"`
+ signal string `schema:"signal"`
}{
// override any golang type defaults
}
-
if err := decoder.Decode(&query, r.URL.Query()); err != nil {
utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return
}
+ muxVars := mux.Vars(r)
+ if _, found := muxVars["signal"]; found {
+ signal = query.signal
+ }
+
+ sig, err := util.ParseSignal(signal)
+ if err != nil {
+ utils.InternalServerError(w, errors.Wrapf(err, "unable to parse signal value"))
+ }
name := mux.Vars(r)["name"]
pod, err := runtime.LookupPod(name)
if err != nil {
@@ -419,8 +429,7 @@ func PodKill(w http.ResponseWriter, r *http.Request) {
utils.Error(w, msg, http.StatusConflict, errors.Errorf("cannot kill a pod with no running containers: %s", pod.ID()))
return
}
- // TODO How do we differentiate if a signal was sent vs accepting the pod/container default?
- _, err = pod.Kill(uint(query.signal))
+ _, err = pod.Kill(uint(sig))
if err != nil {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return
diff --git a/pkg/api/handlers/swagger.go b/pkg/api/handlers/swagger.go
index c845c8195..0db4e19b6 100644
--- a/pkg/api/handlers/swagger.go
+++ b/pkg/api/handlers/swagger.go
@@ -30,9 +30,7 @@ type swagImageInspect struct {
// swagger:response DocsImageDeleteResponse
type swagImageDeleteResponse struct {
// in:body
- Body struct {
- image.ImageDeleteResponse
- }
+ Body []image.ImageDeleteResponse
}
// Search results
diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go
index 3ec0742bd..b6f125c58 100644
--- a/pkg/api/handlers/utils/errors.go
+++ b/pkg/api/handlers/utils/errors.go
@@ -86,3 +86,8 @@ func (e ErrorModel) Error() string {
func (e ErrorModel) Cause() error {
return errors.New(e.Because)
}
+
+// UnsupportedParameter logs a given param by its string name as not supported.
+func UnSupportedParameter(param string) {
+ log.Infof("API parameter %q: not supported", param)
+}
diff --git a/pkg/api/server/listener_api.go b/pkg/api/server/listener_api.go
new file mode 100644
index 000000000..4984216b8
--- /dev/null
+++ b/pkg/api/server/listener_api.go
@@ -0,0 +1,31 @@
+package server
+
+import (
+ "net"
+ "os"
+ "path/filepath"
+
+ "github.com/pkg/errors"
+)
+
+// ListenUnix follows stdlib net.Listen() API, providing a unix listener for given path
+// ListenUnix will delete and create files/directories as needed
+func ListenUnix(network string, path string) (net.Listener, error) {
+ // setup custom listener for API server
+ err := os.MkdirAll(filepath.Dir(path), 0770)
+ if err != nil {
+ return nil, errors.Wrapf(err, "api.ListenUnix() failed to create %s", filepath.Dir(path))
+ }
+ os.Remove(path)
+
+ listener, err := net.Listen(network, path)
+ if err != nil {
+ return nil, errors.Wrapf(err, "api.ListenUnix() failed to create net.Listen(%s, %s)", network, path)
+ }
+
+ _, err = os.Stat(path)
+ if err != nil {
+ return nil, errors.Wrapf(err, "net.Listen(%s, %s) failed to report the failure to create socket", network, path)
+ }
+ return listener, nil
+}
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go
index 6f4222d8f..833bb5197 100644
--- a/pkg/api/server/register_containers.go
+++ b/pkg/api/server/register_containers.go
@@ -665,7 +665,7 @@ func (s *APIServer) RegisterContainersHandlers(r *mux.Router) error {
// '500':
// "$ref": "#/responses/InternalError"
r.HandleFunc(VersionedPath("/libpod/containers/{name:..*}/kill"), APIHandler(s.Context, libpod.KillContainer)).Methods(http.MethodGet)
- // swagger:operation GET /libpod/containers/{nameOrID}/mount libpod mountContainer
+ // swagger:operation POST /libpod/containers/{nameOrID}/mount libpod mountContainer
// ---
// tags:
// - containers
@@ -684,12 +684,33 @@ func (s *APIServer) RegisterContainersHandlers(r *mux.Router) error {
// schema:
// description: id
// type: string
- // example: 3c784de79b791b4ebd3ac55e511f97fedc042328499554937a3f8bfd9c1a2cb8
+ // example: /var/lib/containers/storage/overlay/f3f693bd88872a1e3193f4ebb925f4c282e8e73aadb8ab3e7492754dda3a02a4/merged
// '404':
// "$ref": "#/responses/NoSuchContainer"
// '500':
// "$ref": "#/responses/InternalError"
r.HandleFunc(VersionedPath("/libpod/containers/{name:..*}/mount"), APIHandler(s.Context, libpod.MountContainer)).Methods(http.MethodPost)
+ // swagger:operation GET /libpod/containers/{nameOrID}/unmount libpod unmountContainer
+ // ---
+ // tags:
+ // - containers
+ // summary: Unmount a container
+ // description: Unmount a container from the filesystem
+ // parameters:
+ // - in: path
+ // name: nameOrID
+ // required: true
+ // description: the name or ID of the container
+ // produces:
+ // - application/json
+ // responses:
+ // '204':
+ // description: no error
+ // '404':
+ // "$ref": "#/responses/NoSuchContainer"
+ // '500':
+ // "$ref": "#/responses/InternalError"
+ r.HandleFunc(VersionedPath("/libpod/containers/{name:..*}/unmount"), APIHandler(s.Context, libpod.UnmountContainer)).Methods(http.MethodPost)
r.HandleFunc(VersionedPath("/libpod/containers/{name:..*}/logs"), APIHandler(s.Context, libpod.LogsFromContainer)).Methods(http.MethodGet)
// swagger:operation POST /libpod/containers/{nameOrID}/pause libpod libpodPauseContainer
// ---
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index cd42afe71..8ea079654 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -193,8 +193,8 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// responses:
// '200':
// $ref: "#/responses/DocsImageDeleteResponse"
- // '400':
- // $ref: '#/responses/BadParamError'
+ // '404':
+ // $ref: '#/responses/NoSuchImage'
// '409':
// $ref: '#/responses/ConflictError'
// '500':
@@ -342,6 +342,210 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// $ref: '#/responses/InternalError'
r.Handle(VersionedPath("/commit"), APIHandler(s.Context, generic.CommitContainer)).Methods(http.MethodPost)
+ // swagger:operation POST /build images buildImage
+ // ---
+ // tags:
+ // - images
+ // summary: Create image
+ // description: Build an image from the given Dockerfile(s)
+ // parameters:
+ // - in: query
+ // name: dockerfile
+ // type: string
+ // default: Dockerfile
+ // description: |
+ // Path within the build context to the `Dockerfile`.
+ // This is ignored if remote is specified and points to an external `Dockerfile`.
+ // - in: query
+ // name: t
+ // type: string
+ // default: latest
+ // description: A name and optional tag to apply to the image in the `name:tag` format.
+ // - in: query
+ // name: extrahosts
+ // type: string
+ // default:
+ // description: |
+ // TBD Extra hosts to add to /etc/hosts
+ // (As of version 1.xx)
+ // - in: query
+ // name: remote
+ // type: string
+ // default:
+ // description: |
+ // A Git repository URI or HTTP/HTTPS context URI.
+ // If the URI points to a single text file, the file’s contents are placed
+ // into a file called Dockerfile and the image is built from that file. If
+ // the URI points to a tarball, the file is downloaded by the daemon and the
+ // contents therein used as the context for the build. If the URI points to a
+ // tarball and the dockerfile parameter is also specified, there must be a file
+ // with the corresponding path inside the tarball.
+ // (As of version 1.xx)
+ // - in: query
+ // name: q
+ // type: boolean
+ // default: false
+ // description: |
+ // Suppress verbose build output
+ // - in: query
+ // name: nocache
+ // type: boolean
+ // default: false
+ // description: |
+ // Do not use the cache when building the image
+ // (As of version 1.xx)
+ // - in: query
+ // name: cachefrom
+ // type: string
+ // default:
+ // description: |
+ // JSON array of images used to build cache resolution
+ // (As of version 1.xx)
+ // - in: query
+ // name: pull
+ // type: boolean
+ // default: false
+ // description: |
+ // Attempt to pull the image even if an older image exists locally
+ // (As of version 1.xx)
+ // - in: query
+ // name: rm
+ // type: boolean
+ // default: true
+ // description: |
+ // Remove intermediate containers after a successful build
+ // (As of version 1.xx)
+ // - in: query
+ // name: forcerm
+ // type: boolean
+ // default: false
+ // description: |
+ // Always remove intermediate containers, even upon failure
+ // (As of version 1.xx)
+ // - in: query
+ // name: memory
+ // type: integer
+ // description: |
+ // Memory is the upper limit (in bytes) on how much memory running containers can use
+ // (As of version 1.xx)
+ // - in: query
+ // name: memswap
+ // type: integer
+ // description: |
+ // MemorySwap limits the amount of memory and swap together
+ // (As of version 1.xx)
+ // - in: query
+ // name: cpushares
+ // type: integer
+ // description: |
+ // CPUShares (relative weight
+ // (As of version 1.xx)
+ // - in: query
+ // name: cpusetcpus
+ // type: string
+ // description: |
+ // CPUSetCPUs in which to allow execution (0-3, 0,1)
+ // (As of version 1.xx)
+ // - in: query
+ // name: cpuperiod
+ // type: integer
+ // description: |
+ // CPUPeriod limits the CPU CFS (Completely Fair Scheduler) period
+ // (As of version 1.xx)
+ // - in: query
+ // name: cpuquota
+ // type: integer
+ // description: |
+ // CPUQuota limits the CPU CFS (Completely Fair Scheduler) quota
+ // (As of version 1.xx)
+ // - in: query
+ // name: buildargs
+ // type: string
+ // default:
+ // description: |
+ // JSON map of string pairs denoting build-time variables.
+ // For example, the build argument `Foo` with the value of `bar` would be encoded in JSON as `["Foo":"bar"]`.
+ //
+ // For example, buildargs={"Foo":"bar"}.
+ //
+ // Note(s):
+ // * This should not be used to pass secrets.
+ // * The value of buildargs should be URI component encoded before being passed to the API.
+ //
+ // (As of version 1.xx)
+ // - in: query
+ // name: shmsize
+ // type: integer
+ // default: 67108864
+ // description: |
+ // ShmSize is the "size" value to use when mounting an shmfs on the container's /dev/shm directory.
+ // Default is 64MB
+ // (As of version 1.xx)
+ // - in: query
+ // name: squash
+ // type: boolean
+ // default: false
+ // description: |
+ // Silently ignored.
+ // Squash the resulting images layers into a single layer
+ // (As of version 1.xx)
+ // - in: query
+ // name: labels
+ // type: string
+ // default:
+ // description: |
+ // JSON map of key, value pairs to set as labels on the new image
+ // (As of version 1.xx)
+ // - in: query
+ // name: networkmode
+ // type: string
+ // default: bridge
+ // description: |
+ // Sets the networking mode for the run commands during build.
+ // Supported standard values are:
+ // * `bridge` limited to containers within a single host, port mapping required for external access
+ // * `host` no isolation between host and containers on this network
+ // * `none` disable all networking for this container
+ // * container:<nameOrID> share networking with given container
+ // ---All other values are assumed to be a custom network's name
+ // (As of version 1.xx)
+ // - in: query
+ // name: platform
+ // type: string
+ // default:
+ // description: |
+ // Platform format os[/arch[/variant]]
+ // (As of version 1.xx)
+ // - in: query
+ // name: target
+ // type: string
+ // default:
+ // description: |
+ // Target build stage
+ // (As of version 1.xx)
+ // - in: query
+ // name: outputs
+ // type: string
+ // default:
+ // description: |
+ // output configuration TBD
+ // (As of version 1.xx)
+ // produces:
+ // - application/json
+ // responses:
+ // 200:
+ // description: OK (As of version 1.xx)
+ // schema:
+ // type: object
+ // required:
+ // - stream
+ // properties:
+ // stream:
+ // type: string
+ // example: |
+ // (build details...)
+ // Successfully built 8ba084515c724cbf90d447a63600c0a6
+ r.Handle(VersionedPath("/build"), APIHandler(s.Context, handlers.BuildImage)).Methods(http.MethodPost)
/*
libpod endpoints
*/
@@ -506,11 +710,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// - application/json
// responses:
// '200':
- // schema:
- // items:
- // $ref: "#/responses/DocsIageDeleteResponse"
- // '400':
- // $ref: "#/responses/BadParamError"
+ // $ref: "#/responses/DocsImageDeleteResponse"
// '404':
// $ref: '#/responses/NoSuchImage'
// '409':
@@ -533,10 +733,12 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// name: format
// type: string
// description: format for exported image
+ // default: oci-archive
// - in: query
// name: compress
// type: bool
// description: use compression on image
+ // default: false
// produces:
// - application/json
// responses:
@@ -605,6 +807,5 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// $ref: '#/responses/InternalError'
r.Handle(VersionedPath("/libpod/images/{name:..*}/tag"), APIHandler(s.Context, handlers.TagImage)).Methods(http.MethodPost)
- r.Handle(VersionedPath("/build"), APIHandler(s.Context, handlers.BuildImage)).Methods(http.MethodPost)
return nil
}
diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go
index 5069326b6..4018cfbe8 100644
--- a/pkg/api/server/register_pods.go
+++ b/pkg/api/server/register_pods.go
@@ -121,8 +121,9 @@ func (s *APIServer) registerPodsHandlers(r *mux.Router) error {
// description: the name or ID of the pod
// - in: query
// name: signal
- // type: int
+ // type: string
// description: signal to be sent to pod
+ // default: SIGKILL
// responses:
// '204':
// description: no error
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 2bda5ad01..69a44f21a 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -1,6 +1,8 @@
-// Package serviceapi Provides a Container compatible interface.
+// Package api Provides a container compatible interface.
//
-// This documentation describes the HTTP LibPod interface
+// This documentation describes the HTTP Libpod interface. It is to be consider
+// only as experimental as this point. The endpoints, parameters, inputs, and
+// return values can all change.
//
// Schemes: http, https
// Host: podman.io
@@ -8,6 +10,10 @@
// Version: 0.0.1
// License: Apache-2.0 https://opensource.org/licenses/Apache-2.0
// Contact: Podman <podman@lists.podman.io> https://podman.io/community/
+// InfoExtensions:
+// x-logo:
+// - url: https://raw.githubusercontent.com/containers/libpod/master/logo/podman-logo.png
+// - altText: "Podman logo"
//
// Consumes:
// - application/json
@@ -19,12 +25,18 @@
// - text/html
//
// tags:
-// - name: "Containers"
-// description: manage containers
-// - name: "Images"
-// description: manage images
-// - name: "System"
-// description: manage system resources
+// - name: containers
+// description: Actions related to containers
+// - name: images
+// description: Actions related to images
+// - name: pods
+// description: Actions related to pods
+// - name: volumes
+// description: Actions related to volumes
+// - name: containers (compat)
+// description: Actions related to containers for the compatibility endpoints
+// - name: images (compat)
+// description: Actions related to images for the compatibility endpoints
//
// swagger:meta
package server
@@ -48,9 +60,9 @@ import (
)
type APIServer struct {
- http.Server // Where the HTTP work happens
+ http.Server // The HTTP work happens here
*schema.Decoder // Decoder for Query parameters to structs
- context.Context // Context for graceful server shutdown
+ context.Context // Context to carry objects to handlers
*libpod.Runtime // Where the real work happens
net.Listener // mux for routing HTTP API calls to libpod routines
context.CancelFunc // Stop APIServer
@@ -58,14 +70,37 @@ type APIServer struct {
time.Duration // Duration of client access sliding window
}
-// NewServer will create and configure a new API HTTP server
+// Number of seconds to wait for next request, if exceeded shutdown server
+const (
+ DefaultServiceDuration = 300 * time.Second
+ UnlimitedServiceDuration = 0 * time.Second
+)
+
+// NewServer will create and configure a new API server with all defaults
func NewServer(runtime *libpod.Runtime) (*APIServer, error) {
- listeners, err := activation.Listeners()
- if err != nil {
- return nil, errors.Wrap(err, "Cannot retrieve file descriptors from systemd")
- }
- if len(listeners) != 1 {
- return nil, errors.Errorf("Wrong number of file descriptors from systemd for socket activation (%d != 1)", len(listeners))
+ return newServer(runtime, DefaultServiceDuration, nil)
+}
+
+// NewServerWithSettings will create and configure a new API server using provided settings
+func NewServerWithSettings(runtime *libpod.Runtime, duration time.Duration, listener *net.Listener) (*APIServer, error) {
+ return newServer(runtime, duration, listener)
+}
+
+func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Listener) (*APIServer, error) {
+ // If listener not provided try socket activation protocol
+ if listener == nil {
+ if _, found := os.LookupEnv("LISTEN_FDS"); !found {
+ return nil, errors.Errorf("Cannot create Server, no listener provided and socket activation protocol is not active.")
+ }
+
+ listeners, err := activation.Listeners()
+ if err != nil {
+ return nil, errors.Wrap(err, "Cannot retrieve file descriptors from systemd")
+ }
+ if len(listeners) != 1 {
+ return nil, errors.Errorf("Wrong number of file descriptors for socket activation protocol (%d != 1)", len(listeners))
+ }
+ listener = &listeners[0]
}
router := mux.NewRouter()
@@ -80,9 +115,9 @@ func NewServer(runtime *libpod.Runtime) (*APIServer, error) {
Decoder: schema.NewDecoder(),
Context: nil,
Runtime: runtime,
- Listener: listeners[0],
+ Listener: *listener,
CancelFunc: nil,
- Duration: 300 * time.Second,
+ Duration: duration,
}
server.Timer = time.AfterFunc(server.Duration, func() {
if err := server.Shutdown(); err != nil {
@@ -176,6 +211,11 @@ func (s *APIServer) Serve() error {
// Shutdown is a clean shutdown waiting on existing clients
func (s *APIServer) Shutdown() error {
+ // Duration == 0 flags no auto-shutdown of server
+ if s.Duration == 0 {
+ return nil
+ }
+
// We're still in the sliding service window
if s.Timer.Stop() {
s.Timer.Reset(s.Duration)
diff --git a/pkg/bindings/containers.go b/pkg/bindings/containers.go
index 01f68f970..057580088 100644
--- a/pkg/bindings/containers.go
+++ b/pkg/bindings/containers.go
@@ -126,11 +126,11 @@ func (c Connection) ContainerExists(nameOrID string) (bool, error) {
return false, nil
}
-func (c Connection) StopContainer(nameOrID string, timeout int) error {
- // TODO we might need to distinguish whether a timeout is desired; a zero, the int
- // zero value is valid; what do folks want to do?
+func (c Connection) StopContainer(nameOrID string, timeout *int) error {
params := make(map[string]string)
- params["t"] = strconv.Itoa(timeout)
+ if timeout != nil {
+ params["t"] = strconv.Itoa(*timeout)
+ }
response, err := c.newRequest(http.MethodPost, fmt.Sprintf("/containers/%s/stop", nameOrID), nil, params)
if err != nil {
return err
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 193c788c0..041a161dc 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -266,6 +266,8 @@ static void __attribute__((constructor)) init()
char path[PATH_MAX];
const char *const suffix = "/libpod/pause.pid";
char *cwd = getcwd (NULL, 0);
+ char uid_fmt[16];
+ char gid_fmt[16];
if (cwd == NULL)
{
@@ -324,6 +326,13 @@ static void __attribute__((constructor)) init()
exit (EXIT_FAILURE);
}
+ sprintf (uid_fmt, "%d", uid);
+ sprintf (gid_fmt, "%d", gid);
+
+ setenv ("_CONTAINERS_USERNS_CONFIGURED", "init", 1);
+ setenv ("_CONTAINERS_ROOTLESS_UID", uid_fmt, 1);
+ setenv ("_CONTAINERS_ROOTLESS_GID", gid_fmt, 1);
+
r = setns (fd, 0);
if (r < 0)
{
diff --git a/pkg/spec/namespaces.go b/pkg/spec/namespaces.go
index e62d4ed0a..1f98e6e25 100644
--- a/pkg/spec/namespaces.go
+++ b/pkg/spec/namespaces.go
@@ -213,8 +213,8 @@ func (c *CgroupConfig) ToCreateOptions(runtime *libpod.Runtime) ([]libpod.CtrCre
options = append(options, libpod.WithCgroupParent(c.CgroupParent))
}
- if c.Cgroups == "disabled" {
- options = append(options, libpod.WithNoCgroups())
+ if c.Cgroups != "" {
+ options = append(options, libpod.WithCgroupsMode(c.Cgroups))
}
return options, nil
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
index 7a220012f..cae055bb0 100644
--- a/pkg/spec/spec.go
+++ b/pkg/spec/spec.go
@@ -358,10 +358,10 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
return nil, errors.New("cannot specify resource limits when cgroups are disabled is specified")
}
configSpec.Linux.Resources = &spec.LinuxResources{}
- case "enabled", "":
+ case "enabled", "no-conmon", "":
// Do nothing
default:
- return nil, errors.New("unrecognized option for cgroups; supported are 'default' and 'disabled'")
+ return nil, errors.New("unrecognized option for cgroups; supported are 'default', 'disabled', 'no-conmon'")
}
// Add annotations
diff --git a/pkg/systemdgen/systemdgen.go b/pkg/systemdgen/systemdgen.go
index 745b708e4..26b3b3756 100644
--- a/pkg/systemdgen/systemdgen.go
+++ b/pkg/systemdgen/systemdgen.go
@@ -153,13 +153,14 @@ func CreateContainerSystemdUnit(info *ContainerInfo, opts Options) (string, erro
if len(info.CreateCommand) < index+1 {
return "", errors.Errorf("container's create command is too short or invalid: %v", info.CreateCommand)
}
- // We're hard-coding the first four arguments and append the
- // CreatCommand with a stripped command and subcomand.
+ // We're hard-coding the first five arguments and append the
+ // CreateCommand with a stripped command and subcomand.
command := []string{
info.Executable,
"run",
"--conmon-pidfile", "/%t/%n-pid",
"--cidfile", "/%t/%n-cid",
+ "--cgroups=no-conmon",
}
command = append(command, info.CreateCommand[index:]...)
info.RunCommand = strings.Join(command, " ")
diff --git a/pkg/systemdgen/systemdgen_test.go b/pkg/systemdgen/systemdgen_test.go
index 9c6933d17..ee2429407 100644
--- a/pkg/systemdgen/systemdgen_test.go
+++ b/pkg/systemdgen/systemdgen_test.go
@@ -122,7 +122,7 @@ Documentation=man:podman-generate-systemd(1)
[Service]
Restart=always
ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
-ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN
+ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --cgroups=no-conmon --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN
ExecStop=/usr/bin/podman stop --ignore --cidfile /%t/%n-cid -t 42
ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile /%t/%n-cid
PIDFile=/%t/%n-pid
diff --git a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
new file mode 100644
index 000000000..114db5aec
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
@@ -0,0 +1,164 @@
+kind: CustomResourceDefinition
+apiVersion: apiextensions.k8s.io/v1beta1
+metadata:
+ name: clusteroperators.config.openshift.io
+spec:
+ additionalPrinterColumns:
+ - JSONPath: .status.versions[?(@.name=="operator")].version
+ description: The version the operator is at.
+ name: Version
+ type: string
+ - JSONPath: .status.conditions[?(@.type=="Available")].status
+ description: Whether the operator is running and stable.
+ name: Available
+ type: string
+ - JSONPath: .status.conditions[?(@.type=="Progressing")].status
+ description: Whether the operator is processing changes.
+ name: Progressing
+ type: string
+ - JSONPath: .status.conditions[?(@.type=="Degraded")].status
+ description: Whether the operator is degraded.
+ name: Degraded
+ type: string
+ - JSONPath: .status.conditions[?(@.type=="Available")].lastTransitionTime
+ description: The time the operator's Available status last changed.
+ name: Since
+ type: date
+ group: config.openshift.io
+ names:
+ kind: ClusterOperator
+ listKind: ClusterOperatorList
+ plural: clusteroperators
+ singular: clusteroperator
+ shortNames:
+ - co
+ preserveUnknownFields: false
+ scope: Cluster
+ subresources:
+ status: {}
+ version: v1
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ validation:
+ openAPIV3Schema:
+ description: ClusterOperator is the Custom Resource object which holds the current
+ state of an operator. This object is used by operators to convey their state
+ to the rest of the cluster.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds configuration that could apply to any operator.
+ type: object
+ status:
+ description: status holds the information about the state of an operator. It
+ is consistent with status information across the Kubernetes ecosystem.
+ type: object
+ properties:
+ conditions:
+ description: conditions describes the state of the operator's managed
+ and monitored components.
+ type: array
+ items:
+ description: ClusterOperatorStatusCondition represents the state of
+ the operator's managed and monitored components.
+ type: object
+ required:
+ - lastTransitionTime
+ - status
+ - type
+ properties:
+ lastTransitionTime:
+ description: lastTransitionTime is the time of the last update
+ to the current status property.
+ type: string
+ format: date-time
+ message:
+ description: message provides additional information about the
+ current condition. This is only to be consumed by humans.
+ type: string
+ reason:
+ description: reason is the CamelCase reason for the condition's
+ current status.
+ type: string
+ status:
+ description: status of the condition, one of True, False, Unknown.
+ type: string
+ type:
+ description: type specifies the aspect reported by this condition.
+ type: string
+ extension:
+ description: extension contains any additional status information specific
+ to the operator which owns this status object.
+ type: object
+ nullable: true
+ x-kubernetes-preserve-unknown-fields: true
+ relatedObjects:
+ description: 'relatedObjects is a list of objects that are "interesting"
+ or related to this operator. Common uses are: 1. the detailed resource
+ driving the operator 2. operator namespaces 3. operand namespaces'
+ type: array
+ items:
+ description: ObjectReference contains enough information to let you
+ inspect or modify the referred object.
+ type: object
+ required:
+ - group
+ - name
+ - resource
+ properties:
+ group:
+ description: group of the referent.
+ type: string
+ name:
+ description: name of the referent.
+ type: string
+ namespace:
+ description: namespace of the referent.
+ type: string
+ resource:
+ description: resource of the referent.
+ type: string
+ versions:
+ description: versions is a slice of operator and operand version tuples. Operators
+ which manage multiple operands will have multiple operand entries
+ in the array. Available operators must report the version of the
+ operator itself with the name "operator". An operator reports a new
+ "operator" version when it has rolled out the new version to all of
+ its operands.
+ type: array
+ items:
+ type: object
+ required:
+ - name
+ - version
+ properties:
+ name:
+ description: name is the name of the particular operand this version
+ is for. It usually matches container images, not operators.
+ type: string
+ version:
+ description: version indicates which version of a particular operand
+ is currently being managed. It must always match the Available
+ operand. If 1.0.0 is Available, then this must indicate 1.0.0
+ even if the operator is trying to rollout 1.1.0
+ type: string
+ versions:
+ - name: v1
+ served: true
+ storage: true
diff --git a/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
new file mode 100644
index 000000000..ccde0db23
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
@@ -0,0 +1,328 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: clusterversions.config.openshift.io
+spec:
+ group: config.openshift.io
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ scope: Cluster
+ subresources:
+ status: {}
+ names:
+ plural: clusterversions
+ singular: clusterversion
+ kind: ClusterVersion
+ preserveUnknownFields: false
+ additionalPrinterColumns:
+ - name: Version
+ type: string
+ JSONPath: .status.history[?(@.state=="Completed")].version
+ - name: Available
+ type: string
+ JSONPath: .status.conditions[?(@.type=="Available")].status
+ - name: Progressing
+ type: string
+ JSONPath: .status.conditions[?(@.type=="Progressing")].status
+ - name: Since
+ type: date
+ JSONPath: .status.conditions[?(@.type=="Progressing")].lastTransitionTime
+ - name: Status
+ type: string
+ JSONPath: .status.conditions[?(@.type=="Progressing")].message
+ validation:
+ openAPIV3Schema:
+ description: ClusterVersion is the configuration for the ClusterVersionOperator.
+ This is where parameters related to automatic updates can be set.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec is the desired state of the cluster version - the operator
+ will work to ensure that the desired version is applied to the cluster.
+ type: object
+ required:
+ - clusterID
+ properties:
+ channel:
+ description: channel is an identifier for explicitly requesting that
+ a non-default set of updates be applied to this cluster. The default
+ channel will be contain stable updates that are appropriate for production
+ clusters.
+ type: string
+ clusterID:
+ description: clusterID uniquely identifies this cluster. This is expected
+ to be an RFC4122 UUID value (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+ in hexadecimal values). This is a required field.
+ type: string
+ desiredUpdate:
+ description: "desiredUpdate is an optional field that indicates the
+ desired value of the cluster version. Setting this value will trigger
+ an upgrade (if the current version does not match the desired version).
+ The set of recommended update values is listed as part of available
+ updates in status, and setting values outside that range may cause
+ the upgrade to fail. You may specify the version field without setting
+ image if an update exists with that version in the availableUpdates
+ or history. \n If an upgrade fails the operator will halt and report
+ status about the failing component. Setting the desired update value
+ back to the previous version will cause a rollback to be attempted.
+ Not all rollbacks will succeed."
+ type: object
+ properties:
+ force:
+ description: "force allows an administrator to update to an image
+ that has failed verification, does not appear in the availableUpdates
+ list, or otherwise would be blocked by normal protections on update.
+ This option should only be used when the authenticity of the provided
+ image has been verified out of band because the provided image
+ will run with full administrative access to the cluster. Do not
+ use this flag with images that comes from unknown or potentially
+ malicious sources. \n This flag does not override other forms
+ of consistency checking that are required before a new update
+ is deployed."
+ type: boolean
+ image:
+ description: image is a container image location that contains the
+ update. When this field is part of spec, image is optional if
+ version is specified and the availableUpdates field contains a
+ matching version.
+ type: string
+ version:
+ description: version is a semantic versioning identifying the update
+ version. When this field is part of spec, version is optional
+ if image is specified.
+ type: string
+ overrides:
+ description: overrides is list of overides for components that are managed
+ by cluster version operator. Marking a component unmanaged will prevent
+ the operator from creating or updating the object.
+ type: array
+ items:
+ description: ComponentOverride allows overriding cluster version operator's
+ behavior for a component.
+ type: object
+ required:
+ - group
+ - kind
+ - name
+ - namespace
+ - unmanaged
+ properties:
+ group:
+ description: group identifies the API group that the kind is in.
+ type: string
+ kind:
+ description: kind indentifies which object to override.
+ type: string
+ name:
+ description: name is the component's name.
+ type: string
+ namespace:
+ description: namespace is the component's namespace. If the resource
+ is cluster scoped, the namespace should be empty.
+ type: string
+ unmanaged:
+ description: 'unmanaged controls if cluster version operator should
+ stop managing the resources in this cluster. Default: false'
+ type: boolean
+ upstream:
+ description: upstream may be used to specify the preferred update server.
+ By default it will use the appropriate update server for the cluster
+ and region.
+ type: string
+ status:
+ description: status contains information about the available updates and
+ any in-progress updates.
+ type: object
+ required:
+ - availableUpdates
+ - desired
+ - observedGeneration
+ - versionHash
+ properties:
+ availableUpdates:
+ description: availableUpdates contains the list of updates that are
+ appropriate for this cluster. This list may be empty if no updates
+ are recommended, if the update service is unavailable, or if an invalid
+ channel has been specified.
+ type: array
+ items:
+ description: Update represents a release of the ClusterVersionOperator,
+ referenced by the Image member.
+ type: object
+ properties:
+ force:
+ description: "force allows an administrator to update to an image
+ that has failed verification, does not appear in the availableUpdates
+ list, or otherwise would be blocked by normal protections on
+ update. This option should only be used when the authenticity
+ of the provided image has been verified out of band because
+ the provided image will run with full administrative access
+ to the cluster. Do not use this flag with images that comes
+ from unknown or potentially malicious sources. \n This flag
+ does not override other forms of consistency checking that are
+ required before a new update is deployed."
+ type: boolean
+ image:
+ description: image is a container image location that contains
+ the update. When this field is part of spec, image is optional
+ if version is specified and the availableUpdates field contains
+ a matching version.
+ type: string
+ version:
+ description: version is a semantic versioning identifying the
+ update version. When this field is part of spec, version is
+ optional if image is specified.
+ type: string
+ nullable: true
+ conditions:
+ description: conditions provides information about the cluster version.
+ The condition "Available" is set to true if the desiredUpdate has
+ been reached. The condition "Progressing" is set to true if an update
+ is being applied. The condition "Degraded" is set to true if an update
+ is currently blocked by a temporary or permanent error. Conditions
+ are only valid for the current desiredUpdate when metadata.generation
+ is equal to status.generation.
+ type: array
+ items:
+ description: ClusterOperatorStatusCondition represents the state of
+ the operator's managed and monitored components.
+ type: object
+ required:
+ - lastTransitionTime
+ - status
+ - type
+ properties:
+ lastTransitionTime:
+ description: lastTransitionTime is the time of the last update
+ to the current status property.
+ type: string
+ format: date-time
+ message:
+ description: message provides additional information about the
+ current condition. This is only to be consumed by humans.
+ type: string
+ reason:
+ description: reason is the CamelCase reason for the condition's
+ current status.
+ type: string
+ status:
+ description: status of the condition, one of True, False, Unknown.
+ type: string
+ type:
+ description: type specifies the aspect reported by this condition.
+ type: string
+ desired:
+ description: desired is the version that the cluster is reconciling
+ towards. If the cluster is not yet fully initialized desired will
+ be set with the information available, which may be an image or a
+ tag.
+ type: object
+ properties:
+ force:
+ description: "force allows an administrator to update to an image
+ that has failed verification, does not appear in the availableUpdates
+ list, or otherwise would be blocked by normal protections on update.
+ This option should only be used when the authenticity of the provided
+ image has been verified out of band because the provided image
+ will run with full administrative access to the cluster. Do not
+ use this flag with images that comes from unknown or potentially
+ malicious sources. \n This flag does not override other forms
+ of consistency checking that are required before a new update
+ is deployed."
+ type: boolean
+ image:
+ description: image is a container image location that contains the
+ update. When this field is part of spec, image is optional if
+ version is specified and the availableUpdates field contains a
+ matching version.
+ type: string
+ version:
+ description: version is a semantic versioning identifying the update
+ version. When this field is part of spec, version is optional
+ if image is specified.
+ type: string
+ history:
+ description: history contains a list of the most recent versions applied
+ to the cluster. This value may be empty during cluster startup, and
+ then will be updated when a new update is being applied. The newest
+ update is first in the list and it is ordered by recency. Updates
+ in the history have state Completed if the rollout completed - if
+ an update was failing or halfway applied the state will be Partial.
+ Only a limited amount of update history is preserved.
+ type: array
+ items:
+ description: UpdateHistory is a single attempted update to the cluster.
+ type: object
+ required:
+ - completionTime
+ - image
+ - startedTime
+ - state
+ - verified
+ properties:
+ completionTime:
+ description: completionTime, if set, is when the update was fully
+ applied. The update that is currently being applied will have
+ a null completion time. Completion time will always be set for
+ entries that are not the current update (usually to the started
+ time of the next update).
+ type: string
+ format: date-time
+ nullable: true
+ image:
+ description: image is a container image location that contains
+ the update. This value is always populated.
+ type: string
+ startedTime:
+ description: startedTime is the time at which the update was started.
+ type: string
+ format: date-time
+ state:
+ description: state reflects whether the update was fully applied.
+ The Partial state indicates the update is not fully applied,
+ while the Completed state indicates the update was successfully
+ rolled out at least once (all parts of the update successfully
+ applied).
+ type: string
+ verified:
+ description: verified indicates whether the provided update was
+ properly verified before it was installed. If this is false
+ the cluster may not be trusted.
+ type: boolean
+ version:
+ description: version is a semantic versioning identifying the
+ update version. If the requested image does not define a version,
+ or if a failure occurs retrieving the image, this value may
+ be empty.
+ type: string
+ observedGeneration:
+ description: observedGeneration reports which version of the spec is
+ being synced. If this value is not equal to metadata.generation, then
+ the desired and conditions fields may represent a previous version.
+ type: integer
+ format: int64
+ versionHash:
+ description: versionHash is a fingerprint of the content that the cluster
+ will be updated with. It is used by the operator to avoid unnecessary
+ work and is for internal use only.
+ type: string
+ versions:
+ - name: v1
+ served: true
+ storage: true
diff --git a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
new file mode 100644
index 000000000..8c857d45a
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
@@ -0,0 +1,101 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: operatorhubs.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: OperatorHub
+ listKind: OperatorHubList
+ plural: operatorhubs
+ singular: operatorhub
+ scope: Cluster
+ preserveUnknownFields: false
+ subresources:
+ status: {}
+ version: v1
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: OperatorHub is the Schema for the operatorhubs API. It can be used
+ to change the state of the default hub sources for OperatorHub on the cluster
+ from enabled to disabled and vice versa.
+ type: object
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: OperatorHubSpec defines the desired state of OperatorHub
+ type: object
+ properties:
+ disableAllDefaultSources:
+ description: disableAllDefaultSources allows you to disable all the
+ default hub sources. If this is true, a specific entry in sources
+ can be used to enable a default source. If this is false, a specific
+ entry in sources can be used to disable or enable a default source.
+ type: boolean
+ sources:
+ description: sources is the list of default hub sources and their configuration.
+ If the list is empty, it implies that the default hub sources are
+ enabled on the cluster unless disableAllDefaultSources is true. If
+ disableAllDefaultSources is true and sources is not empty, the configuration
+ present in sources will take precedence. The list of default hub sources
+ and their current state will always be reflected in the status block.
+ type: array
+ items:
+ description: HubSource is used to specify the hub source and its configuration
+ type: object
+ properties:
+ disabled:
+ description: disabled is used to disable a default hub source
+ on cluster
+ type: boolean
+ name:
+ description: name is the name of one of the default hub sources
+ type: string
+ maxLength: 253
+ minLength: 1
+ status:
+ description: OperatorHubStatus defines the observed state of OperatorHub.
+ The current state of the default hub sources will always be reflected
+ here.
+ type: object
+ properties:
+ sources:
+ description: sources encapsulates the result of applying the configuration
+ for each hub source
+ type: array
+ items:
+ description: HubSourceStatus is used to reflect the current state
+ of applying the configuration to a default source
+ type: object
+ properties:
+ disabled:
+ description: disabled is used to disable a default hub source
+ on cluster
+ type: boolean
+ message:
+ description: message provides more information regarding failures
+ type: string
+ name:
+ description: name is the name of one of the default hub sources
+ type: string
+ maxLength: 253
+ minLength: 1
+ status:
+ description: status indicates success or failure in applying the
+ configuration
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
new file mode 100644
index 000000000..afd076747
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
@@ -0,0 +1,98 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: proxies.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ names:
+ kind: Proxy
+ listKind: ProxyList
+ plural: proxies
+ singular: proxy
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Proxy holds cluster-wide information on how to configure default
+ proxies for the cluster. The canonical name is `cluster`
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: Spec holds user-settable values for the proxy configuration
+ type: object
+ properties:
+ httpProxy:
+ description: httpProxy is the URL of the proxy for HTTP requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ httpsProxy:
+ description: httpsProxy is the URL of the proxy for HTTPS requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ noProxy:
+ description: noProxy is a comma-separated list of hostnames and/or CIDRs
+ for which the proxy should not be used. Empty means unset and will
+ not result in an env var.
+ type: string
+ readinessEndpoints:
+ description: readinessEndpoints is a list of endpoints used to verify
+ readiness of the proxy.
+ type: array
+ items:
+ type: string
+ trustedCA:
+ description: "trustedCA is a reference to a ConfigMap containing a CA
+ certificate bundle used for client egress HTTPS connections. The certificate
+ bundle must be from the CA that signed the proxy's certificate and
+ be signed for everything. The trustedCA field should only be consumed
+ by a proxy validator. The validator is responsible for reading the
+ certificate bundle from required key \"ca-bundle.crt\" and copying
+ it to a ConfigMap named \"trusted-ca-bundle\" in the \"openshift-config-managed\"
+ namespace. The namespace for the ConfigMap referenced by trustedCA
+ is \"openshift-config\". Here is an example ConfigMap (in yaml): \n
+ apiVersion: v1 kind: ConfigMap metadata: name: user-ca-bundle namespace:
+ openshift-config data: ca-bundle.crt: | -----BEGIN CERTIFICATE-----
+ \ Custom CA certificate bundle. -----END CERTIFICATE-----"
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ httpProxy:
+ description: httpProxy is the URL of the proxy for HTTP requests.
+ type: string
+ httpsProxy:
+ description: httpsProxy is the URL of the proxy for HTTPS requests.
+ type: string
+ noProxy:
+ description: noProxy is a comma-separated list of hostnames and/or CIDRs
+ for which the proxy should not be used.
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
new file mode 100644
index 000000000..4e1fdac37
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
@@ -0,0 +1,219 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: apiservers.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ names:
+ kind: APIServer
+ singular: apiserver
+ plural: apiservers
+ listKind: APIServerList
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: APIServer holds configuration (like serving certificates, client
+ CA and CORS domains) shared by all API servers in the system, among them especially
+ kube-apiserver and openshift-apiserver. The canonical name of an instance
+ is 'cluster'.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ type: object
+ properties:
+ additionalCORSAllowedOrigins:
+ description: additionalCORSAllowedOrigins lists additional, user-defined
+ regular expressions describing hosts for which the API server allows
+ access using the CORS headers. This may be needed to access the API
+ and the integrated OAuth server from JavaScript applications. The
+ values are regular expressions that correspond to the Golang regular
+ expression language.
+ type: array
+ items:
+ type: string
+ clientCA:
+ description: 'clientCA references a ConfigMap containing a certificate
+ bundle for the signers that will be recognized for incoming client
+ certificates in addition to the operator managed signers. If this
+ is empty, then only operator managed signers are valid. You usually
+ only have to set this if you have your own PKI you wish to honor client
+ certificates from. The ConfigMap must exist in the openshift-config
+ namespace and contain the following required fields: - ConfigMap.Data["ca-bundle.crt"]
+ - CA bundle.'
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ encryption:
+ description: encryption allows the configuration of encryption of resources
+ at the datastore layer.
+ type: object
+ properties:
+ type:
+ description: "type defines what encryption type should be used to
+ encrypt resources at the datastore layer. When this field is unset
+ (i.e. when it is set to the empty string), identity is implied.
+ The behavior of unset can and will change over time. Even if
+ encryption is enabled by default, the meaning of unset may change
+ to a different encryption type based on changes in best practices.
+ \n When encryption is enabled, all sensitive resources shipped
+ with the platform are encrypted. This list of sensitive resources
+ can and will change over time. The current authoritative list
+ is: \n 1. secrets 2. configmaps 3. routes.route.openshift.io
+ \ 4. oauthaccesstokens.oauth.openshift.io 5. oauthauthorizetokens.oauth.openshift.io"
+ type: string
+ enum:
+ - ""
+ - identity
+ - aescbc
+ servingCerts:
+ description: servingCert is the TLS cert info for serving secure traffic.
+ If not specified, operator managed certificates will be used for serving
+ secure traffic.
+ type: object
+ properties:
+ namedCertificates:
+ description: namedCertificates references secrets containing the
+ TLS cert info for serving secure traffic to specific hostnames.
+ If no named certificates are provided, or no named certificates
+ match the server name as understood by a client, the defaultServingCertificate
+ will be used.
+ type: array
+ items:
+ description: APIServerNamedServingCert maps a server DNS name,
+ as understood by a client, to a certificate.
+ type: object
+ properties:
+ names:
+ description: names is a optional list of explicit DNS names
+ (leading wildcards allowed) that should use this certificate
+ to serve secure traffic. If no names are provided, the implicit
+ names will be extracted from the certificates. Exact names
+ trump over wildcard names. Explicit names defined here trump
+ over extracted implicit names.
+ type: array
+ items:
+ type: string
+ servingCertificate:
+ description: 'servingCertificate references a kubernetes.io/tls
+ type secret containing the TLS cert info for serving secure
+ traffic. The secret must exist in the openshift-config namespace
+ and contain the following required fields: - Secret.Data["tls.key"]
+ - TLS private key. - Secret.Data["tls.crt"] - TLS certificate.'
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ tlsSecurityProfile:
+ description: "tlsSecurityProfile specifies settings for TLS connections
+ for externally exposed servers. \n If unset, a default (which may
+ change between releases) is chosen. Note that only Old and Intermediate
+ profiles are currently supported, and the maximum available MinTLSVersions
+ is VersionTLS12."
+ type: object
+ properties:
+ custom:
+ description: "custom is a user-defined TLS security profile. Be
+ extremely careful using a custom profile as invalid configurations
+ can be catastrophic. An example custom profile looks like this:
+ \n ciphers: - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305
+ \ - ECDHE-RSA-AES128-GCM-SHA256 - ECDHE-ECDSA-AES128-GCM-SHA256
+ \ minTLSVersion: TLSv1.1"
+ type: object
+ properties:
+ ciphers:
+ description: "ciphers is used to specify the cipher algorithms
+ that are negotiated during the TLS handshake. Operators may
+ remove entries their operands do not support. For example,
+ to use DES-CBC3-SHA (yaml): \n ciphers: - DES-CBC3-SHA"
+ type: array
+ items:
+ type: string
+ minTLSVersion:
+ description: "minTLSVersion is used to specify the minimal version
+ of the TLS protocol that is negotiated during the TLS handshake.
+ For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):
+ \n minTLSVersion: TLSv1.1 \n NOTE: currently the highest
+ minTLSVersion allowed is VersionTLS12"
+ type: string
+ nullable: true
+ intermediate:
+ description: "intermediate is a TLS security profile based on: \n
+ https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
+ \n and looks like this (yaml): \n ciphers: - TLS_AES_128_GCM_SHA256
+ \ - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256
+ \ - ECDHE-ECDSA-AES128-GCM-SHA256 - ECDHE-RSA-AES128-GCM-SHA256
+ \ - ECDHE-ECDSA-AES256-GCM-SHA384 - ECDHE-RSA-AES256-GCM-SHA384
+ \ - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305
+ \ - DHE-RSA-AES128-GCM-SHA256 - DHE-RSA-AES256-GCM-SHA384
+ \ minTLSVersion: TLSv1.2"
+ type: object
+ nullable: true
+ modern:
+ description: "modern is a TLS security profile based on: \n https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
+ \n and looks like this (yaml): \n ciphers: - TLS_AES_128_GCM_SHA256
+ \ - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256
+ \ minTLSVersion: TLSv1.3 \n NOTE: Currently unsupported."
+ type: object
+ nullable: true
+ old:
+ description: "old is a TLS security profile based on: \n https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
+ \n and looks like this (yaml): \n ciphers: - TLS_AES_128_GCM_SHA256
+ \ - TLS_AES_256_GCM_SHA384 - TLS_CHACHA20_POLY1305_SHA256
+ \ - ECDHE-ECDSA-AES128-GCM-SHA256 - ECDHE-RSA-AES128-GCM-SHA256
+ \ - ECDHE-ECDSA-AES256-GCM-SHA384 - ECDHE-RSA-AES256-GCM-SHA384
+ \ - ECDHE-ECDSA-CHACHA20-POLY1305 - ECDHE-RSA-CHACHA20-POLY1305
+ \ - DHE-RSA-AES128-GCM-SHA256 - DHE-RSA-AES256-GCM-SHA384
+ \ - DHE-RSA-CHACHA20-POLY1305 - ECDHE-ECDSA-AES128-SHA256
+ \ - ECDHE-RSA-AES128-SHA256 - ECDHE-ECDSA-AES128-SHA -
+ ECDHE-RSA-AES128-SHA - ECDHE-ECDSA-AES256-SHA384 - ECDHE-RSA-AES256-SHA384
+ \ - ECDHE-ECDSA-AES256-SHA - ECDHE-RSA-AES256-SHA -
+ DHE-RSA-AES128-SHA256 - DHE-RSA-AES256-SHA256 - AES128-GCM-SHA256
+ \ - AES256-GCM-SHA384 - AES128-SHA256 - AES256-SHA256
+ \ - AES128-SHA - AES256-SHA - DES-CBC3-SHA minTLSVersion:
+ TLSv1.0"
+ type: object
+ nullable: true
+ type:
+ description: "type is one of Old, Intermediate, Modern or Custom.
+ Custom provides the ability to specify individual TLS security
+ profile parameters. Old, Intermediate and Modern are TLS security
+ profiles based on: \n https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations
+ \n The profiles are intent based, so they may change over time
+ as new ciphers are developed and existing ciphers are found to
+ be insecure. Depending on precisely which ciphers are available
+ to a process, the list may be reduced. \n Note that the Modern
+ profile is currently not supported because it is not yet well
+ adopted by common software libraries."
+ type: string
+ status:
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
new file mode 100644
index 000000000..f21ac7ea8
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
@@ -0,0 +1,123 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: authentications.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: Authentication
+ listKind: AuthenticationList
+ plural: authentications
+ singular: authentication
+ scope: Cluster
+ preserveUnknownFields: false
+ subresources:
+ status: {}
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: Authentication specifies cluster-wide settings for authentication
+ (like OAuth and webhook token authenticators). The canonical name of an instance
+ is `cluster`.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ oauthMetadata:
+ description: 'oauthMetadata contains the discovery endpoint data for
+ OAuth 2.0 Authorization Server Metadata for an external OAuth server.
+ This discovery document can be viewed from its served location: oc
+ get --raw ''/.well-known/oauth-authorization-server'' For further
+ details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2
+ If oauthMetadata.name is non-empty, this value has precedence over
+ any metadata reference stored in status. The key "oauthMetadata" is
+ used to locate the data. If specified and the config map or expected
+ key is not found, no metadata is served. If the specified metadata
+ is not valid, no metadata is served. The namespace for this config
+ map is openshift-config.'
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ type:
+ description: type identifies the cluster managed, user facing authentication
+ mode in use. Specifically, it manages the component that responds
+ to login attempts. The default is IntegratedOAuth.
+ type: string
+ webhookTokenAuthenticators:
+ description: webhookTokenAuthenticators configures remote token reviewers.
+ These remote authentication webhooks can be used to verify bearer
+ tokens via the tokenreviews.authentication.k8s.io REST API. This
+ is required to honor bearer tokens that are provisioned by an external
+ authentication service. The namespace for these secrets is openshift-config.
+ type: array
+ items:
+ description: webhookTokenAuthenticator holds the necessary configuration
+ options for a remote token authenticator
+ type: object
+ properties:
+ kubeConfig:
+ description: 'kubeConfig contains kube config file data which
+ describes how to access the remote webhook service. For further
+ details, see: https://kubernetes.io/docs/reference/access-authn-authz/authentication/#webhook-token-authentication
+ The key "kubeConfig" is used to locate the data. If the secret
+ or expected key is not found, the webhook is not honored. If
+ the specified kube config data is not valid, the webhook is
+ not honored. The namespace for this secret is determined by
+ the point of use.'
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced secret
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ integratedOAuthMetadata:
+ description: 'integratedOAuthMetadata contains the discovery endpoint
+ data for OAuth 2.0 Authorization Server Metadata for the in-cluster
+ integrated OAuth server. This discovery document can be viewed from
+ its served location: oc get --raw ''/.well-known/oauth-authorization-server''
+ For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2
+ This contains the observed value based on cluster state. An explicitly
+ set value in spec.oauthMetadata has precedence over this field. This
+ field has no meaning if authentication spec.type is not set to IntegratedOAuth.
+ The key "oauthMetadata" is used to locate the data. If the config
+ map or expected key is not found, no metadata is served. If the specified
+ metadata is not valid, no metadata is served. The namespace for this
+ config map is openshift-config-managed.'
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
new file mode 100644
index 000000000..8f7583971
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
@@ -0,0 +1,366 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: builds.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ names:
+ kind: Build
+ singular: build
+ plural: builds
+ listKind: BuildList
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: "Build configures the behavior of OpenShift builds for the entire
+ cluster. This includes default settings that can be overridden in BuildConfig
+ objects, and overrides which are applied to all builds. \n The canonical name
+ is \"cluster\""
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: Spec holds user-settable values for the build controller configuration
+ type: object
+ properties:
+ additionalTrustedCA:
+ description: "AdditionalTrustedCA is a reference to a ConfigMap containing
+ additional CAs that should be trusted for image pushes and pulls during
+ builds. The namespace for this config map is openshift-config. \n
+ DEPRECATED: Additional CAs for image pull and push should be set on
+ image.config.openshift.io/cluster instead."
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ buildDefaults:
+ description: BuildDefaults controls the default information for Builds
+ type: object
+ properties:
+ defaultProxy:
+ description: "DefaultProxy contains the default proxy settings for
+ all build operations, including image pull/push and source download.
+ \n Values can be overrode by setting the `HTTP_PROXY`, `HTTPS_PROXY`,
+ and `NO_PROXY` environment variables in the build config's strategy."
+ type: object
+ properties:
+ httpProxy:
+ description: httpProxy is the URL of the proxy for HTTP requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ httpsProxy:
+ description: httpsProxy is the URL of the proxy for HTTPS requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ noProxy:
+ description: noProxy is a comma-separated list of hostnames
+ and/or CIDRs for which the proxy should not be used. Empty
+ means unset and will not result in an env var.
+ type: string
+ readinessEndpoints:
+ description: readinessEndpoints is a list of endpoints used
+ to verify readiness of the proxy.
+ type: array
+ items:
+ type: string
+ trustedCA:
+ description: "trustedCA is a reference to a ConfigMap containing
+ a CA certificate bundle used for client egress HTTPS connections.
+ The certificate bundle must be from the CA that signed the
+ proxy's certificate and be signed for everything. The trustedCA
+ field should only be consumed by a proxy validator. The validator
+ is responsible for reading the certificate bundle from required
+ key \"ca-bundle.crt\" and copying it to a ConfigMap named
+ \"trusted-ca-bundle\" in the \"openshift-config-managed\"
+ namespace. The namespace for the ConfigMap referenced by trustedCA
+ is \"openshift-config\". Here is an example ConfigMap (in
+ yaml): \n apiVersion: v1 kind: ConfigMap metadata: name:
+ user-ca-bundle namespace: openshift-config data: ca-bundle.crt:
+ | -----BEGIN CERTIFICATE----- Custom CA certificate
+ bundle. -----END CERTIFICATE-----"
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ env:
+ description: Env is a set of default environment variables that
+ will be applied to the build if the specified variables do not
+ exist on the build
+ type: array
+ items:
+ description: EnvVar represents an environment variable present
+ in a Container.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: Name of the environment variable. Must be a C_IDENTIFIER.
+ type: string
+ value:
+ description: 'Variable references $(VAR_NAME) are expanded
+ using the previous defined environment variables in the
+ container and any service environment variables. If a variable
+ cannot be resolved, the reference in the input string will
+ be unchanged. The $(VAR_NAME) syntax can be escaped with
+ a double $$, ie: $$(VAR_NAME). Escaped references will never
+ be expanded, regardless of whether the variable exists or
+ not. Defaults to "".'
+ type: string
+ valueFrom:
+ description: Source for the environment variable's value.
+ Cannot be used if value is not empty.
+ type: object
+ properties:
+ configMapKeyRef:
+ description: Selects a key of a ConfigMap.
+ type: object
+ required:
+ - key
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its
+ key must be defined
+ type: boolean
+ fieldRef:
+ description: 'Selects a field of the pod: supports metadata.name,
+ metadata.namespace, metadata.labels, metadata.annotations,
+ spec.nodeName, spec.serviceAccountName, status.hostIP,
+ status.podIP, status.podIPs.'
+ type: object
+ required:
+ - fieldPath
+ properties:
+ apiVersion:
+ description: Version of the schema the FieldPath is
+ written in terms of, defaults to "v1".
+ type: string
+ fieldPath:
+ description: Path of the field to select in the specified
+ API version.
+ type: string
+ resourceFieldRef:
+ description: 'Selects a resource of the container: only
+ resources limits and requests (limits.cpu, limits.memory,
+ limits.ephemeral-storage, requests.cpu, requests.memory
+ and requests.ephemeral-storage) are currently supported.'
+ type: object
+ required:
+ - resource
+ properties:
+ containerName:
+ description: 'Container name: required for volumes,
+ optional for env vars'
+ type: string
+ divisor:
+ description: Specifies the output format of the exposed
+ resources, defaults to "1"
+ type: string
+ resource:
+ description: 'Required: resource to select'
+ type: string
+ secretKeyRef:
+ description: Selects a key of a secret in the pod's namespace
+ type: object
+ required:
+ - key
+ properties:
+ key:
+ description: The key of the secret to select from. Must
+ be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key
+ must be defined
+ type: boolean
+ gitProxy:
+ description: "GitProxy contains the proxy settings for git operations
+ only. If set, this will override any Proxy settings for all git
+ commands, such as git clone. \n Values that are not set here will
+ be inherited from DefaultProxy."
+ type: object
+ properties:
+ httpProxy:
+ description: httpProxy is the URL of the proxy for HTTP requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ httpsProxy:
+ description: httpsProxy is the URL of the proxy for HTTPS requests. Empty
+ means unset and will not result in an env var.
+ type: string
+ noProxy:
+ description: noProxy is a comma-separated list of hostnames
+ and/or CIDRs for which the proxy should not be used. Empty
+ means unset and will not result in an env var.
+ type: string
+ readinessEndpoints:
+ description: readinessEndpoints is a list of endpoints used
+ to verify readiness of the proxy.
+ type: array
+ items:
+ type: string
+ trustedCA:
+ description: "trustedCA is a reference to a ConfigMap containing
+ a CA certificate bundle used for client egress HTTPS connections.
+ The certificate bundle must be from the CA that signed the
+ proxy's certificate and be signed for everything. The trustedCA
+ field should only be consumed by a proxy validator. The validator
+ is responsible for reading the certificate bundle from required
+ key \"ca-bundle.crt\" and copying it to a ConfigMap named
+ \"trusted-ca-bundle\" in the \"openshift-config-managed\"
+ namespace. The namespace for the ConfigMap referenced by trustedCA
+ is \"openshift-config\". Here is an example ConfigMap (in
+ yaml): \n apiVersion: v1 kind: ConfigMap metadata: name:
+ user-ca-bundle namespace: openshift-config data: ca-bundle.crt:
+ | -----BEGIN CERTIFICATE----- Custom CA certificate
+ bundle. -----END CERTIFICATE-----"
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ imageLabels:
+ description: ImageLabels is a list of docker labels that are applied
+ to the resulting image. User can override a default label by providing
+ a label with the same name in their Build/BuildConfig.
+ type: array
+ items:
+ type: object
+ properties:
+ name:
+ description: Name defines the name of the label. It must have
+ non-zero length.
+ type: string
+ value:
+ description: Value defines the literal value of the label.
+ type: string
+ resources:
+ description: Resources defines resource requirements to execute
+ the build.
+ type: object
+ properties:
+ limits:
+ description: 'Limits describes the maximum amount of compute
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ type: object
+ additionalProperties:
+ type: string
+ requests:
+ description: 'Requests describes the minimum amount of compute
+ resources required. If Requests is omitted for a container,
+ it defaults to Limits if that is explicitly specified, otherwise
+ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ type: object
+ additionalProperties:
+ type: string
+ buildOverrides:
+ description: BuildOverrides controls override settings for builds
+ type: object
+ properties:
+ imageLabels:
+ description: ImageLabels is a list of docker labels that are applied
+ to the resulting image. If user provided a label in their Build/BuildConfig
+ with the same name as one in this list, the user's label will
+ be overwritten.
+ type: array
+ items:
+ type: object
+ properties:
+ name:
+ description: Name defines the name of the label. It must have
+ non-zero length.
+ type: string
+ value:
+ description: Value defines the literal value of the label.
+ type: string
+ nodeSelector:
+ description: NodeSelector is a selector which must be true for the
+ build pod to fit on a node
+ type: object
+ additionalProperties:
+ type: string
+ tolerations:
+ description: Tolerations is a list of Tolerations that will override
+ any existing tolerations set on a build pod.
+ type: array
+ items:
+ description: The pod this Toleration is attached to tolerates
+ any taint that matches the triple <key,value,effect> using the
+ matching operator <operator>.
+ type: object
+ properties:
+ effect:
+ description: Effect indicates the taint effect to match. Empty
+ means match all taint effects. When specified, allowed values
+ are NoSchedule, PreferNoSchedule and NoExecute.
+ type: string
+ key:
+ description: Key is the taint key that the toleration applies
+ to. Empty means match all taint keys. If the key is empty,
+ operator must be Exists; this combination means to match
+ all values and all keys.
+ type: string
+ operator:
+ description: Operator represents a key's relationship to the
+ value. Valid operators are Exists and Equal. Defaults to
+ Equal. Exists is equivalent to wildcard for value, so that
+ a pod can tolerate all taints of a particular category.
+ type: string
+ tolerationSeconds:
+ description: TolerationSeconds represents the period of time
+ the toleration (which must be of effect NoExecute, otherwise
+ this field is ignored) tolerates the taint. By default,
+ it is not set, which means tolerate the taint forever (do
+ not evict). Zero and negative values will be treated as
+ 0 (evict immediately) by the system.
+ type: integer
+ format: int64
+ value:
+ description: Value is the taint value the toleration matches
+ to. If the operator is Exists, the value should be empty,
+ otherwise just a regular string.
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
new file mode 100644
index 000000000..b527f7aa3
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
@@ -0,0 +1,70 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: consoles.config.openshift.io
+spec:
+ scope: Cluster
+ preserveUnknownFields: false
+ group: config.openshift.io
+ names:
+ kind: Console
+ listKind: ConsoleList
+ plural: consoles
+ singular: console
+ subresources:
+ status: {}
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: Console holds cluster-wide configuration for the web console, including
+ the logout URL, and reports the public URL of the console. The canonical name
+ is `cluster`.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ authentication:
+ description: ConsoleAuthentication defines a list of optional configuration
+ for console authentication.
+ type: object
+ properties:
+ logoutRedirect:
+ description: 'An optional, absolute URL to redirect web browsers
+ to after logging out of the console. If not specified, it will
+ redirect to the default login page. This is required when using
+ an identity provider that supports single sign-on (SSO) such as:
+ - OpenID (Keycloak, Azure) - RequestHeader (GSSAPI, SSPI, SAML)
+ - OAuth (GitHub, GitLab, Google) Logging out of the console will
+ destroy the user''s token. The logoutRedirect provides the user
+ the option to perform single logout (SLO) through the identity
+ provider to destroy their single sign-on session.'
+ type: string
+ pattern: ^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ consoleURL:
+ description: The URL for the console. This will be derived from the
+ host for the route that is created for the console.
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
new file mode 100644
index 000000000..c883ee0f0
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
@@ -0,0 +1,100 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: dnses.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: DNS
+ listKind: DNSList
+ plural: dnses
+ singular: dns
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: DNS holds cluster-wide information about DNS. The canonical name
+ is `cluster`
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ baseDomain:
+ description: "baseDomain is the base domain of the cluster. All managed
+ DNS records will be sub-domains of this base. \n For example, given
+ the base domain `openshift.example.com`, an API server DNS record
+ may be created for `cluster-api.openshift.example.com`. \n Once set,
+ this field cannot be changed."
+ type: string
+ privateZone:
+ description: "privateZone is the location where all the DNS records
+ that are only available internally to the cluster exist. \n If this
+ field is nil, no private records should be created. \n Once set, this
+ field cannot be changed."
+ type: object
+ properties:
+ id:
+ description: "id is the identifier that can be used to find the
+ DNS hosted zone. \n on AWS zone can be fetched using `ID` as id
+ in [1] on Azure zone can be fetched using `ID` as a pre-determined
+ name in [2], on GCP zone can be fetched using `ID` as a pre-determined
+ name in [3]. \n [1]: https://docs.aws.amazon.com/cli/latest/reference/route53/get-hosted-zone.html#options
+ [2]: https://docs.microsoft.com/en-us/cli/azure/network/dns/zone?view=azure-cli-latest#az-network-dns-zone-show
+ [3]: https://cloud.google.com/dns/docs/reference/v1/managedZones/get"
+ type: string
+ tags:
+ description: "tags can be used to query the DNS hosted zone. \n
+ on AWS, resourcegroupstaggingapi [1] can be used to fetch a zone
+ using `Tags` as tag-filters, \n [1]: https://docs.aws.amazon.com/cli/latest/reference/resourcegroupstaggingapi/get-resources.html#options"
+ type: object
+ additionalProperties:
+ type: string
+ publicZone:
+ description: "publicZone is the location where all the DNS records that
+ are publicly accessible to the internet exist. \n If this field is
+ nil, no public records should be created. \n Once set, this field
+ cannot be changed."
+ type: object
+ properties:
+ id:
+ description: "id is the identifier that can be used to find the
+ DNS hosted zone. \n on AWS zone can be fetched using `ID` as id
+ in [1] on Azure zone can be fetched using `ID` as a pre-determined
+ name in [2], on GCP zone can be fetched using `ID` as a pre-determined
+ name in [3]. \n [1]: https://docs.aws.amazon.com/cli/latest/reference/route53/get-hosted-zone.html#options
+ [2]: https://docs.microsoft.com/en-us/cli/azure/network/dns/zone?view=azure-cli-latest#az-network-dns-zone-show
+ [3]: https://cloud.google.com/dns/docs/reference/v1/managedZones/get"
+ type: string
+ tags:
+ description: "tags can be used to query the DNS hosted zone. \n
+ on AWS, resourcegroupstaggingapi [1] can be used to fetch a zone
+ using `Tags` as tag-filters, \n [1]: https://docs.aws.amazon.com/cli/latest/reference/resourcegroupstaggingapi/get-resources.html#options"
+ type: object
+ additionalProperties:
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
new file mode 100644
index 000000000..89084a33f
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
@@ -0,0 +1,76 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: featuregates.config.openshift.io
+spec:
+ group: config.openshift.io
+ version: v1
+ scope: Cluster
+ preserveUnknownFields: false
+ names:
+ kind: FeatureGate
+ singular: featuregate
+ plural: featuregates
+ listKind: FeatureGateList
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Feature holds cluster-wide information about feature gates. The
+ canonical name is `cluster`
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ customNoUpgrade:
+ description: customNoUpgrade allows the enabling or disabling of any
+ feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE,
+ and PREVENTS UPGRADES. Because of its nature, this setting cannot
+ be validated. If you have any typos or accidentally apply invalid
+ combinations your cluster may fail in an unrecoverable way. featureSet
+ must equal "CustomNoUpgrade" must be set to use this field.
+ type: object
+ properties:
+ disabled:
+ description: disabled is a list of all feature gates that you want
+ to force off
+ type: array
+ items:
+ type: string
+ enabled:
+ description: enabled is a list of all feature gates that you want
+ to force on
+ type: array
+ items:
+ type: string
+ nullable: true
+ featureSet:
+ description: featureSet changes the list of features in the cluster. The
+ default is empty. Be very careful adjusting this setting. Turning
+ on or off features may cause irreversible changes in your cluster
+ which cannot be undone.
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
new file mode 100644
index 000000000..a0fd48709
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
@@ -0,0 +1,144 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: images.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ names:
+ kind: Image
+ singular: image
+ plural: images
+ listKind: ImageList
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Image governs policies related to imagestream imports and runtime
+ configuration for external registries. It allows cluster admins to configure
+ which registries OpenShift is allowed to import images from, extra CA trust
+ bundles for external registries, and policies to blacklist/whitelist registry
+ hostnames. When exposing OpenShift's image registry to the public, this also
+ lets cluster admins specify the external hostname.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ additionalTrustedCA:
+ description: additionalTrustedCA is a reference to a ConfigMap containing
+ additional CAs that should be trusted during imagestream import, pod
+ image pull, build image pull, and imageregistry pullthrough. The namespace
+ for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ allowedRegistriesForImport:
+ description: allowedRegistriesForImport limits the container image registries
+ that normal users may import images from. Set this list to the registries
+ that you trust to contain valid Docker images and that you want applications
+ to be able to import from. Users with permission to create Images
+ or ImageStreamMappings via the API are not affected by this policy
+ - typically only administrators or system integrations will have those
+ permissions.
+ type: array
+ items:
+ description: RegistryLocation contains a location of the registry
+ specified by the registry domain name. The domain name might include
+ wildcards, like '*' or '??'.
+ type: object
+ properties:
+ domainName:
+ description: domainName specifies a domain name for the registry
+ In case the registry use non-standard (80 or 443) port, the
+ port should be included in the domain name as well.
+ type: string
+ insecure:
+ description: insecure indicates whether the registry is secure
+ (https) or insecure (http) By default (if not specified) the
+ registry is assumed as secure.
+ type: boolean
+ externalRegistryHostnames:
+ description: externalRegistryHostnames provides the hostnames for the
+ default external image registry. The external hostname should be set
+ only when the image registry is exposed externally. The first value
+ is used in 'publicDockerImageRepository' field in ImageStreams. The
+ value must be in "hostname[:port]" format.
+ type: array
+ items:
+ type: string
+ registrySources:
+ description: registrySources contains configuration that determines
+ how the container runtime should treat individual registries when
+ accessing images for builds+pods. (e.g. whether or not to allow insecure
+ access). It does not contain configuration for the internal cluster
+ registry.
+ type: object
+ properties:
+ allowedRegistries:
+ description: "allowedRegistries are whitelisted for image pull/push.
+ All other registries are blocked. \n Only one of BlockedRegistries
+ or AllowedRegistries may be set."
+ type: array
+ items:
+ type: string
+ blockedRegistries:
+ description: "blockedRegistries are blacklisted from image pull/push.
+ All other registries are allowed. \n Only one of BlockedRegistries
+ or AllowedRegistries may be set."
+ type: array
+ items:
+ type: string
+ insecureRegistries:
+ description: insecureRegistries are registries which do not have
+ a valid TLS certificates or only support HTTP connections.
+ type: array
+ items:
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ externalRegistryHostnames:
+ description: externalRegistryHostnames provides the hostnames for the
+ default external image registry. The external hostname should be set
+ only when the image registry is exposed externally. The first value
+ is used in 'publicDockerImageRepository' field in ImageStreams. The
+ value must be in "hostname[:port]" format.
+ type: array
+ items:
+ type: string
+ internalRegistryHostname:
+ description: internalRegistryHostname sets the hostname for the default
+ internal image registry. The value must be in "hostname[:port]" format.
+ This value is set by the image registry operator which controls the
+ internal registry hostname. For backward compatibility, users can
+ still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this
+ setting overrides the environment variable.
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
new file mode 100644
index 000000000..2aba542da
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
@@ -0,0 +1,221 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: infrastructures.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: Infrastructure
+ listKind: InfrastructureList
+ plural: infrastructures
+ singular: infrastructure
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: Infrastructure holds cluster-wide information about Infrastructure. The
+ canonical name is `cluster`
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ cloudConfig:
+ description: cloudConfig is a reference to a ConfigMap containing the
+ cloud provider configuration file. This configuration file is used
+ to configure the Kubernetes cloud provider integration when using
+ the built-in cloud provider integration or the external cloud controller
+ manager. The namespace for this config map is openshift-config.
+ type: object
+ properties:
+ key:
+ description: Key allows pointing to a specific key/value inside
+ of the configmap. This is useful for logical file references.
+ type: string
+ name:
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ apiServerInternalURI:
+ description: apiServerInternalURL is a valid URI with scheme(http/https),
+ address and port. apiServerInternalURL can be used by components
+ like kubelets, to contact the Kubernetes API server using the infrastructure
+ provider rather than Kubernetes networking.
+ type: string
+ apiServerURL:
+ description: apiServerURL is a valid URI with scheme(http/https), address
+ and port. apiServerURL can be used by components like the web console
+ to tell users where to find the Kubernetes API.
+ type: string
+ etcdDiscoveryDomain:
+ description: 'etcdDiscoveryDomain is the domain used to fetch the SRV
+ records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery'
+ type: string
+ infrastructureName:
+ description: infrastructureName uniquely identifies a cluster with a
+ human friendly name. Once set it should not be changed. Must be of
+ max length 27 and must have only alphanumeric or hyphen characters.
+ type: string
+ platform:
+ description: "platform is the underlying infrastructure provider for
+ the cluster. \n Deprecated: Use platformStatus.type instead."
+ type: string
+ platformStatus:
+ description: platformStatus holds status information specific to the
+ underlying infrastructure provider.
+ type: object
+ properties:
+ aws:
+ description: AWS contains settings specific to the Amazon Web Services
+ infrastructure provider.
+ type: object
+ properties:
+ region:
+ description: region holds the default AWS region for new AWS
+ resources created by the cluster.
+ type: string
+ azure:
+ description: Azure contains settings specific to the Azure infrastructure
+ provider.
+ type: object
+ properties:
+ networkResourceGroupName:
+ description: networkResourceGroupName is the Resource Group
+ for network resources like the Virtual Network and Subnets
+ used by the cluster. If empty, the value is same as ResourceGroupName.
+ type: string
+ resourceGroupName:
+ description: resourceGroupName is the Resource Group for new
+ Azure resources created for the cluster.
+ type: string
+ baremetal:
+ description: BareMetal contains settings specific to the BareMetal
+ platform.
+ type: object
+ properties:
+ apiServerInternalIP:
+ description: apiServerInternalIP is an IP address to contact
+ the Kubernetes API server that can be used by components inside
+ the cluster, like kubelets using the infrastructure rather
+ than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI
+ points to. It is the IP for a self-hosted load balancer in
+ front of the API servers.
+ type: string
+ ingressIP:
+ description: ingressIP is an external IP which routes to the
+ default ingress controller. The IP is a suitable target of
+ a wildcard DNS record used to resolve default route host names.
+ type: string
+ nodeDNSIP:
+ description: nodeDNSIP is the IP address for the internal DNS
+ used by the nodes. Unlike the one managed by the DNS operator,
+ `NodeDNSIP` provides name resolution for the nodes themselves.
+ There is no DNS-as-a-service for BareMetal deployments. In
+ order to minimize necessary changes to the datacenter DNS,
+ a DNS service is hosted as a static pod to serve those hostnames
+ to the nodes in the cluster.
+ type: string
+ gcp:
+ description: GCP contains settings specific to the Google Cloud
+ Platform infrastructure provider.
+ type: object
+ properties:
+ projectID:
+ description: resourceGroupName is the Project ID for new GCP
+ resources created for the cluster.
+ type: string
+ region:
+ description: region holds the region for new GCP resources created
+ for the cluster.
+ type: string
+ openstack:
+ description: OpenStack contains settings specific to the OpenStack
+ infrastructure provider.
+ type: object
+ properties:
+ apiServerInternalIP:
+ description: apiServerInternalIP is an IP address to contact
+ the Kubernetes API server that can be used by components inside
+ the cluster, like kubelets using the infrastructure rather
+ than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI
+ points to. It is the IP for a self-hosted load balancer in
+ front of the API servers.
+ type: string
+ cloudName:
+ description: cloudName is the name of the desired OpenStack
+ cloud in the client configuration file (`clouds.yaml`).
+ type: string
+ ingressIP:
+ description: ingressIP is an external IP which routes to the
+ default ingress controller. The IP is a suitable target of
+ a wildcard DNS record used to resolve default route host names.
+ type: string
+ nodeDNSIP:
+ description: nodeDNSIP is the IP address for the internal DNS
+ used by the nodes. Unlike the one managed by the DNS operator,
+ `NodeDNSIP` provides name resolution for the nodes themselves.
+ There is no DNS-as-a-service for OpenStack deployments. In
+ order to minimize necessary changes to the datacenter DNS,
+ a DNS service is hosted as a static pod to serve those hostnames
+ to the nodes in the cluster.
+ type: string
+ ovirt:
+ description: Ovirt contains settings specific to the oVirt infrastructure
+ provider.
+ type: object
+ properties:
+ apiServerInternalIP:
+ description: apiServerInternalIP is an IP address to contact
+ the Kubernetes API server that can be used by components inside
+ the cluster, like kubelets using the infrastructure rather
+ than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI
+ points to. It is the IP for a self-hosted load balancer in
+ front of the API servers.
+ type: string
+ ingressIP:
+ description: ingressIP is an external IP which routes to the
+ default ingress controller. The IP is a suitable target of
+ a wildcard DNS record used to resolve default route host names.
+ type: string
+ nodeDNSIP:
+ description: nodeDNSIP is the IP address for the internal DNS
+ used by the nodes. Unlike the one managed by the DNS operator,
+ `NodeDNSIP` provides name resolution for the nodes themselves.
+ There is no DNS-as-a-service for oVirt deployments. In order
+ to minimize necessary changes to the datacenter DNS, a DNS
+ service is hosted as a static pod to serve those hostnames
+ to the nodes in the cluster.
+ type: string
+ type:
+ description: type is the underlying infrastructure provider for
+ the cluster. This value controls whether infrastructure automation
+ such as service load balancers, dynamic volume provisioning, machine
+ creation and deletion, and other integrations are enabled. If
+ None, no infrastructure automation is enabled. Allowed values
+ are "AWS", "Azure", "BareMetal", "GCP", "Libvirt", "OpenStack",
+ "VSphere", "oVirt", and "None". Individual components may not
+ support all platforms, and must handle unrecognized platforms
+ as None if they do not support that platform.
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
new file mode 100644
index 000000000..ada440425
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
@@ -0,0 +1,55 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: ingresses.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: Ingress
+ listKind: IngressList
+ plural: ingresses
+ singular: ingress
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Ingress holds cluster-wide information about ingress, including
+ the default ingress domain used for routes. The canonical name is `cluster`.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ domain:
+ description: "domain is used to generate a default host name for a route
+ when the route's host name is empty. The generated host name will
+ follow this pattern: \"<route-name>.<route-namespace>.<domain>\".
+ \n It is also used as the default wildcard domain suffix for ingress.
+ The default ingresscontroller domain will follow this pattern: \"*.<domain>\".
+ \n Once set, changing domain is not currently supported."
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
new file mode 100644
index 000000000..bc3b62a87
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
@@ -0,0 +1,141 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: networks.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: Network
+ listKind: NetworkList
+ plural: networks
+ singular: network
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: 'Network holds cluster-wide information about Network. The canonical
+ name is `cluster`. It is used to configure the desired network configuration,
+ such as: IP address pools for services/pod IPs, network plugin, etc. Please
+ view network.spec for an explanation on what applies when configuring this
+ resource.'
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration. As a general
+ rule, this SHOULD NOT be read directly. Instead, you should consume the
+ NetworkStatus, as it indicates the currently deployed configuration. Currently,
+ most spec fields are immutable after installation. Please view the individual
+ ones for further details on each.
+ type: object
+ properties:
+ clusterNetwork:
+ description: IP address pool to use for pod IPs. This field is immutable
+ after installation.
+ type: array
+ items:
+ description: ClusterNetworkEntry is a contiguous block of IP addresses
+ from which pod IPs are allocated.
+ type: object
+ properties:
+ cidr:
+ description: The complete block for pod IPs.
+ type: string
+ hostPrefix:
+ description: The size (prefix) of block to allocate to each node.
+ type: integer
+ format: int32
+ minimum: 0
+ externalIP:
+ description: externalIP defines configuration for controllers that affect
+ Service.ExternalIP. If nil, then ExternalIP is not allowed to be set.
+ type: object
+ properties:
+ autoAssignCIDRs:
+ description: autoAssignCIDRs is a list of CIDRs from which to automatically
+ assign Service.ExternalIP. These are assigned when the service
+ is of type LoadBalancer. In general, this is only useful for bare-metal
+ clusters. In Openshift 3.x, this was misleadingly called "IngressIPs".
+ Automatically assigned External IPs are not affected by any ExternalIPPolicy
+ rules. Currently, only one entry may be provided.
+ type: array
+ items:
+ type: string
+ policy:
+ description: policy is a set of restrictions applied to the ExternalIP
+ field. If nil or empty, then ExternalIP is not allowed to be set.
+ type: object
+ properties:
+ allowedCIDRs:
+ description: allowedCIDRs is the list of allowed CIDRs.
+ type: array
+ items:
+ type: string
+ rejectedCIDRs:
+ description: rejectedCIDRs is the list of disallowed CIDRs.
+ These take precedence over allowedCIDRs.
+ type: array
+ items:
+ type: string
+ networkType:
+ description: 'NetworkType is the plugin that is to be deployed (e.g.
+ OpenShiftSDN). This should match a value that the cluster-network-operator
+ understands, or else no networking will be installed. Currently supported
+ values are: - OpenShiftSDN This field is immutable after installation.'
+ type: string
+ serviceNetwork:
+ description: IP address pool for services. Currently, we only support
+ a single entry here. This field is immutable after installation.
+ type: array
+ items:
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
+ properties:
+ clusterNetwork:
+ description: IP address pool to use for pod IPs.
+ type: array
+ items:
+ description: ClusterNetworkEntry is a contiguous block of IP addresses
+ from which pod IPs are allocated.
+ type: object
+ properties:
+ cidr:
+ description: The complete block for pod IPs.
+ type: string
+ hostPrefix:
+ description: The size (prefix) of block to allocate to each node.
+ type: integer
+ format: int32
+ minimum: 0
+ clusterNetworkMTU:
+ description: ClusterNetworkMTU is the MTU for inter-pod networking.
+ type: integer
+ networkType:
+ description: NetworkType is the plugin that is deployed (e.g. OpenShiftSDN).
+ type: string
+ serviceNetwork:
+ description: IP address pool for services. Currently, we only support
+ a single entry here.
+ type: array
+ items:
+ type: string
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
new file mode 100644
index 000000000..fd763d047
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
@@ -0,0 +1,661 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: oauths.config.openshift.io
+spec:
+ group: config.openshift.io
+ names:
+ kind: OAuth
+ listKind: OAuthList
+ plural: oauths
+ singular: oauth
+ scope: Cluster
+ preserveUnknownFields: false
+ subresources:
+ status: {}
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ "validation":
+ "openAPIV3Schema":
+ description: OAuth holds cluster-wide information about OAuth. The canonical
+ name is `cluster`. It is used to configure the integrated OAuth server. This
+ configuration is only honored when the top level Authentication config has
+ type set to IntegratedOAuth.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: OAuthSpec contains desired cluster auth configuration
+ type: object
+ properties:
+ identityProviders:
+ description: identityProviders is an ordered list of ways for a user
+ to identify themselves. When this list is empty, no identities are
+ provisioned for users.
+ type: array
+ items:
+ description: IdentityProvider provides identities for users authenticating
+ using credentials
+ type: object
+ properties:
+ basicAuth:
+ description: basicAuth contains configuration options for the
+ BasicAuth IdP
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ tlsClientCert:
+ description: tlsClientCert is an optional reference to a secret
+ by name that contains the PEM-encoded TLS client certificate
+ to present when connecting to the server. The key "tls.crt"
+ is used to locate the data. If specified and the secret
+ or expected key is not found, the identity provider is not
+ honored. If the specified certificate data is not valid,
+ the identity provider is not honored. The namespace for
+ this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ tlsClientKey:
+ description: tlsClientKey is an optional reference to a secret
+ by name that contains the PEM-encoded TLS private key for
+ the client certificate referenced in tlsClientCert. The
+ key "tls.key" is used to locate the data. If specified and
+ the secret or expected key is not found, the identity provider
+ is not honored. If the specified certificate data is not
+ valid, the identity provider is not honored. The namespace
+ for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ url:
+ description: url is the remote URL to connect to
+ type: string
+ github:
+ description: github enables user authentication using GitHub credentials
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ This can only be configured when hostname is set to a non-empty
+ value. The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ clientID:
+ description: clientID is the oauth client ID
+ type: string
+ clientSecret:
+ description: clientSecret is a required reference to the secret
+ by name containing the oauth client secret. The key "clientSecret"
+ is used to locate the data. If the secret or expected key
+ is not found, the identity provider is not honored. The
+ namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ hostname:
+ description: hostname is the optional domain (e.g. "mycompany.com")
+ for use with a hosted instance of GitHub Enterprise. It
+ must match the GitHub Enterprise settings value configured
+ at /setup/settings#hostname.
+ type: string
+ organizations:
+ description: organizations optionally restricts which organizations
+ are allowed to log in
+ type: array
+ items:
+ type: string
+ teams:
+ description: teams optionally restricts which teams are allowed
+ to log in. Format is <org>/<team>.
+ type: array
+ items:
+ type: string
+ gitlab:
+ description: gitlab enables user authentication using GitLab credentials
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ clientID:
+ description: clientID is the oauth client ID
+ type: string
+ clientSecret:
+ description: clientSecret is a required reference to the secret
+ by name containing the oauth client secret. The key "clientSecret"
+ is used to locate the data. If the secret or expected key
+ is not found, the identity provider is not honored. The
+ namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ url:
+ description: url is the oauth server base URL
+ type: string
+ google:
+ description: google enables user authentication using Google credentials
+ type: object
+ properties:
+ clientID:
+ description: clientID is the oauth client ID
+ type: string
+ clientSecret:
+ description: clientSecret is a required reference to the secret
+ by name containing the oauth client secret. The key "clientSecret"
+ is used to locate the data. If the secret or expected key
+ is not found, the identity provider is not honored. The
+ namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ hostedDomain:
+ description: hostedDomain is the optional Google App domain
+ (e.g. "mycompany.com") to restrict logins to
+ type: string
+ htpasswd:
+ description: htpasswd enables user authentication using an HTPasswd
+ file to validate credentials
+ type: object
+ properties:
+ fileData:
+ description: fileData is a required reference to a secret
+ by name containing the data to use as the htpasswd file.
+ The key "htpasswd" is used to locate the data. If the secret
+ or expected key is not found, the identity provider is not
+ honored. If the specified htpasswd data is not valid, the
+ identity provider is not honored. The namespace for this
+ secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ keystone:
+ description: keystone enables user authentication using keystone
+ password credentials
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ domainName:
+ description: domainName is required for keystone v3
+ type: string
+ tlsClientCert:
+ description: tlsClientCert is an optional reference to a secret
+ by name that contains the PEM-encoded TLS client certificate
+ to present when connecting to the server. The key "tls.crt"
+ is used to locate the data. If specified and the secret
+ or expected key is not found, the identity provider is not
+ honored. If the specified certificate data is not valid,
+ the identity provider is not honored. The namespace for
+ this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ tlsClientKey:
+ description: tlsClientKey is an optional reference to a secret
+ by name that contains the PEM-encoded TLS private key for
+ the client certificate referenced in tlsClientCert. The
+ key "tls.key" is used to locate the data. If specified and
+ the secret or expected key is not found, the identity provider
+ is not honored. If the specified certificate data is not
+ valid, the identity provider is not honored. The namespace
+ for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ url:
+ description: url is the remote URL to connect to
+ type: string
+ ldap:
+ description: ldap enables user authentication using LDAP credentials
+ type: object
+ properties:
+ attributes:
+ description: attributes maps LDAP attributes to identities
+ type: object
+ properties:
+ email:
+ description: email is the list of attributes whose values
+ should be used as the email address. Optional. If unspecified,
+ no email is set for the identity
+ type: array
+ items:
+ type: string
+ id:
+ description: id is the list of attributes whose values
+ should be used as the user ID. Required. First non-empty
+ attribute is used. At least one attribute is required.
+ If none of the listed attribute have a value, authentication
+ fails. LDAP standard identity attribute is "dn"
+ type: array
+ items:
+ type: string
+ name:
+ description: name is the list of attributes whose values
+ should be used as the display name. Optional. If unspecified,
+ no display name is set for the identity LDAP standard
+ display name attribute is "cn"
+ type: array
+ items:
+ type: string
+ preferredUsername:
+ description: preferredUsername is the list of attributes
+ whose values should be used as the preferred username.
+ LDAP standard login attribute is "uid"
+ type: array
+ items:
+ type: string
+ bindDN:
+ description: bindDN is an optional DN to bind with during
+ the search phase.
+ type: string
+ bindPassword:
+ description: bindPassword is an optional reference to a secret
+ by name containing a password to bind with during the search
+ phase. The key "bindPassword" is used to locate the data.
+ If specified and the secret or expected key is not found,
+ the identity provider is not honored. The namespace for
+ this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ insecure:
+ description: 'insecure, if true, indicates the connection
+ should not use TLS WARNING: Should not be set to `true`
+ with the URL scheme "ldaps://" as "ldaps://" URLs always attempt
+ to connect using TLS, even when `insecure` is set to `true`
+ When `true`, "ldap://" URLS connect insecurely. When `false`,
+ "ldap://" URLs are upgraded to a TLS connection using StartTLS
+ as specified in https://tools.ietf.org/html/rfc2830.'
+ type: boolean
+ url:
+ description: 'url is an RFC 2255 URL which specifies the LDAP
+ search parameters to use. The syntax of the URL is: ldap://host:port/basedn?attribute?scope?filter'
+ type: string
+ mappingMethod:
+ description: mappingMethod determines how identities from this
+ provider are mapped to users Defaults to "claim"
+ type: string
+ name:
+ description: 'name is used to qualify the identities returned
+ by this provider. - It MUST be unique and not shared by any
+ other identity provider used - It MUST be a valid path segment:
+ name cannot equal "." or ".." or contain "/" or "%" or ":" Ref:
+ https://godoc.org/github.com/openshift/origin/pkg/user/apis/user/validation#ValidateIdentityProviderName'
+ type: string
+ openID:
+ description: openID enables user authentication using OpenID credentials
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. The key "ca.crt" is used to locate
+ the data. If specified and the config map or expected key
+ is not found, the identity provider is not honored. If the
+ specified ca data is not valid, the identity provider is
+ not honored. If empty, the default system roots are used.
+ The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ claims:
+ description: claims mappings
+ type: object
+ properties:
+ email:
+ description: email is the list of claims whose values
+ should be used as the email address. Optional. If unspecified,
+ no email is set for the identity
+ type: array
+ items:
+ type: string
+ name:
+ description: name is the list of claims whose values should
+ be used as the display name. Optional. If unspecified,
+ no display name is set for the identity
+ type: array
+ items:
+ type: string
+ preferredUsername:
+ description: preferredUsername is the list of claims whose
+ values should be used as the preferred username. If
+ unspecified, the preferred username is determined from
+ the value of the sub claim
+ type: array
+ items:
+ type: string
+ clientID:
+ description: clientID is the oauth client ID
+ type: string
+ clientSecret:
+ description: clientSecret is a required reference to the secret
+ by name containing the oauth client secret. The key "clientSecret"
+ is used to locate the data. If the secret or expected key
+ is not found, the identity provider is not honored. The
+ namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ secret
+ type: string
+ extraAuthorizeParameters:
+ description: extraAuthorizeParameters are any custom parameters
+ to add to the authorize request.
+ type: object
+ additionalProperties:
+ type: string
+ extraScopes:
+ description: extraScopes are any scopes to request in addition
+ to the standard "openid" scope.
+ type: array
+ items:
+ type: string
+ issuer:
+ description: issuer is the URL that the OpenID Provider asserts
+ as its Issuer Identifier. It must use the https scheme with
+ no query or fragment component.
+ type: string
+ requestHeader:
+ description: requestHeader enables user authentication using request
+ header credentials
+ type: object
+ properties:
+ ca:
+ description: ca is a required reference to a config map by
+ name containing the PEM-encoded CA bundle. It is used as
+ a trust anchor to validate the TLS certificate presented
+ by the remote server. Specifically, it allows verification
+ of incoming requests to prevent header spoofing. The key
+ "ca.crt" is used to locate the data. If the config map or
+ expected key is not found, the identity provider is not
+ honored. If the specified ca data is not valid, the identity
+ provider is not honored. The namespace for this config map
+ is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced
+ config map
+ type: string
+ challengeURL:
+ description: challengeURL is a URL to redirect unauthenticated
+ /authorize requests to Unauthenticated requests from OAuth
+ clients which expect WWW-Authenticate challenges will be
+ redirected here. ${url} is replaced with the current URL,
+ escaped to be safe in a query parameter https://www.example.com/sso-login?then=${url}
+ ${query} is replaced with the current query string https://www.example.com/auth-proxy/oauth/authorize?${query}
+ Required when challenge is set to true.
+ type: string
+ clientCommonNames:
+ description: clientCommonNames is an optional list of common
+ names to require a match from. If empty, any client certificate
+ validated against the clientCA bundle is considered authoritative.
+ type: array
+ items:
+ type: string
+ emailHeaders:
+ description: emailHeaders is the set of headers to check for
+ the email address
+ type: array
+ items:
+ type: string
+ headers:
+ description: headers is the set of headers to check for identity
+ information
+ type: array
+ items:
+ type: string
+ loginURL:
+ description: loginURL is a URL to redirect unauthenticated
+ /authorize requests to Unauthenticated requests from OAuth
+ clients which expect interactive logins will be redirected
+ here ${url} is replaced with the current URL, escaped to
+ be safe in a query parameter https://www.example.com/sso-login?then=${url}
+ ${query} is replaced with the current query string https://www.example.com/auth-proxy/oauth/authorize?${query}
+ Required when login is set to true.
+ type: string
+ nameHeaders:
+ description: nameHeaders is the set of headers to check for
+ the display name
+ type: array
+ items:
+ type: string
+ preferredUsernameHeaders:
+ description: preferredUsernameHeaders is the set of headers
+ to check for the preferred username
+ type: array
+ items:
+ type: string
+ type:
+ description: type identifies the identity provider type for this
+ entry.
+ type: string
+ templates:
+ description: templates allow you to customize pages like the login page.
+ type: object
+ properties:
+ error:
+ description: error is the name of a secret that specifies a go template
+ to use to render error pages during the authentication or grant
+ flow. The key "errors.html" is used to locate the template data.
+ If specified and the secret or expected key is not found, the
+ default error page is used. If the specified template is not valid,
+ the default error page is used. If unspecified, the default error
+ page is used. The namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced secret
+ type: string
+ login:
+ description: login is the name of a secret that specifies a go template
+ to use to render the login page. The key "login.html" is used
+ to locate the template data. If specified and the secret or expected
+ key is not found, the default login page is used. If the specified
+ template is not valid, the default login page is used. If unspecified,
+ the default login page is used. The namespace for this secret
+ is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced secret
+ type: string
+ providerSelection:
+ description: providerSelection is the name of a secret that specifies
+ a go template to use to render the provider selection page. The
+ key "providers.html" is used to locate the template data. If specified
+ and the secret or expected key is not found, the default provider
+ selection page is used. If the specified template is not valid,
+ the default provider selection page is used. If unspecified, the
+ default provider selection page is used. The namespace for this
+ secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced secret
+ type: string
+ tokenConfig:
+ description: tokenConfig contains options for authorization and access
+ tokens
+ type: object
+ properties:
+ accessTokenInactivityTimeoutSeconds:
+ description: 'accessTokenInactivityTimeoutSeconds defines the default
+ token inactivity timeout for tokens granted by any client. The
+ value represents the maximum amount of time that can occur between
+ consecutive uses of the token. Tokens become invalid if they are
+ not used within this temporal window. The user will need to acquire
+ a new token to regain access once a token times out. Valid values
+ are integer values: x < 0 Tokens time out is enabled but tokens
+ never timeout unless configured per client (e.g. `-1`) x = 0 Tokens
+ time out is disabled (default) x > 0 Tokens time out if there
+ is no activity for x seconds The current minimum allowed value
+ for X is 300 (5 minutes)'
+ type: integer
+ format: int32
+ accessTokenMaxAgeSeconds:
+ description: accessTokenMaxAgeSeconds defines the maximum age of
+ access tokens
+ type: integer
+ format: int32
+ status:
+ description: OAuthStatus shows current known state of OAuth server in the
+ cluster
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml
new file mode 100644
index 000000000..a625aa617
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml
@@ -0,0 +1,63 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: projects.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ names:
+ kind: Project
+ listKind: ProjectList
+ plural: projects
+ singular: project
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Project holds cluster-wide information about Project. The canonical
+ name is `cluster`
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ projectRequestMessage:
+ description: projectRequestMessage is the string presented to a user
+ if they are unable to request a project via the projectrequest api
+ endpoint
+ type: string
+ projectRequestTemplate:
+ description: projectRequestTemplate is the template to use for creating
+ projects in response to projectrequest. This must point to a template
+ in 'openshift-config' namespace. It is optional. If it is not specified,
+ a default template is used.
+ type: object
+ properties:
+ name:
+ description: name is the metadata.name of the referenced project
+ request template
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
new file mode 100644
index 000000000..6f5336c8f
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
@@ -0,0 +1,88 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: schedulers.config.openshift.io
+spec:
+ group: config.openshift.io
+ scope: Cluster
+ preserveUnknownFields: false
+ names:
+ kind: Scheduler
+ singular: scheduler
+ plural: schedulers
+ listKind: SchedulerList
+ versions:
+ - name: v1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ "validation":
+ "openAPIV3Schema":
+ description: Scheduler holds cluster-wide config information to run the Kubernetes
+ Scheduler and influence its placement decisions. The canonical name for this
+ config is `cluster`.
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ defaultNodeSelector:
+ description: 'defaultNodeSelector helps set the cluster-wide default
+ node selector to restrict pod placement to specific nodes. This is
+ applied to the pods created in all namespaces without a specified
+ nodeSelector value. For example, defaultNodeSelector: "type=user-node,region=east"
+ would set nodeSelector field in pod spec to "type=user-node,region=east"
+ to all pods created in all namespaces. Namespaces having project-wide
+ node selectors won''t be impacted even if this field is set. This
+ adds an annotation section to the namespace. For example, if a new
+ namespace is created with node-selector=''type=user-node,region=east'',
+ the annotation openshift.io/node-selector: type=user-node,region=east
+ gets added to the project. When the openshift.io/node-selector annotation
+ is set on the project the value is used in preference to the value
+ we are setting for defaultNodeSelector field. For instance, openshift.io/node-selector:
+ "type=user-node,region=west" means that the default of "type=user-node,region=east"
+ set in defaultNodeSelector would not be applied.'
+ type: string
+ mastersSchedulable:
+ description: 'MastersSchedulable allows masters nodes to be schedulable.
+ When this flag is turned on, all the master nodes in the cluster will
+ be made schedulable, so that workload pods can run on them. The default
+ value for this field is false, meaning none of the master nodes are
+ schedulable. Important Note: Once the workload pods start running
+ on the master nodes, extreme care must be taken to ensure that cluster-critical
+ control plane components are not impacted. Please turn on this field
+ after doing due diligence.'
+ type: boolean
+ policy:
+ description: policy is a reference to a ConfigMap containing scheduler
+ policy which has user specified predicates and priorities. If this
+ ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider.
+ The namespace for this configmap is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config
+ map
+ type: string
+ status:
+ description: status holds observed values from the cluster. They may not
+ be overridden.
+ type: object
diff --git a/vendor/github.com/openshift/api/config/v1/types.go b/vendor/github.com/openshift/api/config/v1/types.go
index ca36f6777..142748423 100644
--- a/vendor/github.com/openshift/api/config/v1/types.go
+++ b/vendor/github.com/openshift/api/config/v1/types.go
@@ -167,6 +167,7 @@ type AdmissionPluginConfig struct {
// Configuration is an embedded configuration object to be used as the plugin's
// configuration. If present, it will be used instead of the path to the configuration file.
// +nullable
+ // +kubebuilder:pruning:PreserveUnknownFields
Configuration runtime.RawExtension `json:"configuration"`
}
@@ -210,6 +211,7 @@ type AuditConfig struct {
// as the audit policy configuration. If present, it will be used instead of
// the path to the policy file.
// +nullable
+ // +kubebuilder:pruning:PreserveUnknownFields
PolicyConfiguration runtime.RawExtension `json:"policyConfiguration"`
// Format of saved audits (legacy or json).
diff --git a/vendor/github.com/openshift/api/config/v1/types_apiserver.go b/vendor/github.com/openshift/api/config/v1/types_apiserver.go
index ea76aec02..b347bd80e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_apiserver.go
+++ b/vendor/github.com/openshift/api/config/v1/types_apiserver.go
@@ -39,6 +39,16 @@ type APIServerSpec struct {
// The values are regular expressions that correspond to the Golang regular expression language.
// +optional
AdditionalCORSAllowedOrigins []string `json:"additionalCORSAllowedOrigins,omitempty"`
+ // encryption allows the configuration of encryption of resources at the datastore layer.
+ // +optional
+ Encryption APIServerEncryption `json:"encryption"`
+ // tlsSecurityProfile specifies settings for TLS connections for externally exposed servers.
+ //
+ // If unset, a default (which may change between releases) is chosen. Note that only Old and
+ // Intermediate profiles are currently supported, and the maximum available MinTLSVersions
+ // is VersionTLS12.
+ // +optional
+ TLSSecurityProfile *TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
}
type APIServerServingCerts struct {
@@ -63,6 +73,39 @@ type APIServerNamedServingCert struct {
ServingCertificate SecretNameReference `json:"servingCertificate"`
}
+type APIServerEncryption struct {
+ // type defines what encryption type should be used to encrypt resources at the datastore layer.
+ // When this field is unset (i.e. when it is set to the empty string), identity is implied.
+ // The behavior of unset can and will change over time. Even if encryption is enabled by default,
+ // the meaning of unset may change to a different encryption type based on changes in best practices.
+ //
+ // When encryption is enabled, all sensitive resources shipped with the platform are encrypted.
+ // This list of sensitive resources can and will change over time. The current authoritative list is:
+ //
+ // 1. secrets
+ // 2. configmaps
+ // 3. routes.route.openshift.io
+ // 4. oauthaccesstokens.oauth.openshift.io
+ // 5. oauthauthorizetokens.oauth.openshift.io
+ //
+ // +unionDiscriminator
+ // +optional
+ Type EncryptionType `json:"type,omitempty"`
+}
+
+// +kubebuilder:validation:Enum="";identity;aescbc
+type EncryptionType string
+
+const (
+ // identity refers to a type where no encryption is performed at the datastore layer.
+ // Resources are written as-is without encryption.
+ EncryptionTypeIdentity EncryptionType = "identity"
+
+ // aescbc refers to a type where AES-CBC with PKCS#7 padding and a 32-byte key
+ // is used to perform encryption at the datastore layer.
+ EncryptionTypeAESCBC EncryptionType = "aescbc"
+)
+
type APIServerStatus struct {
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_authentication.go b/vendor/github.com/openshift/api/config/v1/types_authentication.go
index 0722ddbfc..eecfe75e7 100644
--- a/vendor/github.com/openshift/api/config/v1/types_authentication.go
+++ b/vendor/github.com/openshift/api/config/v1/types_authentication.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// Authentication specifies cluster-wide settings for authentication (like OAuth and
// webhook token authenticators). The canonical name of an instance is `cluster`.
type Authentication struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -77,7 +76,6 @@ type AuthenticationStatus struct {
type AuthenticationList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
Items []Authentication `json:"items"`
diff --git a/vendor/github.com/openshift/api/config/v1/types_build.go b/vendor/github.com/openshift/api/config/v1/types_build.go
index c7ed7e958..ef4512aa1 100644
--- a/vendor/github.com/openshift/api/config/v1/types_build.go
+++ b/vendor/github.com/openshift/api/config/v1/types_build.go
@@ -9,10 +9,14 @@ import (
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// Build holds cluster-wide information on how to handle builds. The canonical name is `cluster`
+// Build configures the behavior of OpenShift builds for the entire cluster.
+// This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds.
+//
+// The canonical name is "cluster"
type Build struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
+
// Spec holds user-settable values for the build controller configuration
// +kubebuilder:validation:Required
// +required
@@ -23,6 +27,10 @@ type BuildSpec struct {
// AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that
// should be trusted for image pushes and pulls during builds.
// The namespace for this config map is openshift-config.
+ //
+ // DEPRECATED: Additional CAs for image pull and push should be set on
+ // image.config.openshift.io/cluster instead.
+ //
// +optional
AdditionalTrustedCA ConfigMapNameReference `json:"additionalTrustedCA"`
// BuildDefaults controls the default information for Builds
@@ -95,7 +103,7 @@ type BuildOverrides struct {
type BuildList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Build `json:"items"`
+
+ Items []Build `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_operator.go b/vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
index af2ce846c..3681d0ff0 100644
--- a/vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
+++ b/vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
@@ -16,13 +16,13 @@ type ClusterOperator struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata"`
- // spec hold the intent of how this operator should behave.
+ // spec holds configuration that could apply to any operator.
// +kubebuilder:validation:Required
// +required
Spec ClusterOperatorSpec `json:"spec"`
// status holds the information about the state of an operator. It is consistent with status information across
- // the kube ecosystem.
+ // the Kubernetes ecosystem.
// +optional
Status ClusterOperatorStatus `json:"status"`
}
@@ -34,15 +34,15 @@ type ClusterOperatorSpec struct {
// ClusterOperatorStatus provides information about the status of the operator.
// +k8s:deepcopy-gen=true
type ClusterOperatorStatus struct {
- // conditions describes the state of the operator's reconciliation functionality.
+ // conditions describes the state of the operator's managed and monitored components.
// +patchMergeKey=type
// +patchStrategy=merge
// +optional
Conditions []ClusterOperatorStatusCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
- // versions is a slice of operand version tuples. Operators which manage multiple operands will have multiple
- // entries in the array. If an operator is Available, it must have at least one entry. You must report the version of
- // the operator itself with the name "operator".
+ // versions is a slice of operator and operand version tuples. Operators which manage multiple operands will have multiple
+ // operand entries in the array. Available operators must report the version of the operator itself with the name "operator".
+ // An operator reports a new "operator" version when it has rolled out the new version to all of its operands.
// +optional
Versions []OperandVersion `json:"versions,omitempty"`
@@ -57,29 +57,40 @@ type ClusterOperatorStatus struct {
// operator which owns this status object.
// +nullable
// +optional
+ // +kubebuilder:pruning:PreserveUnknownFields
Extension runtime.RawExtension `json:"extension"`
}
type OperandVersion struct {
// name is the name of the particular operand this version is for. It usually matches container images, not operators.
+ // +kubebuilder:validation:Required
+ // +required
Name string `json:"name"`
- // version indicates which version of a particular operand is currently being manage. It must always match the Available
- // condition. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout
+ // version indicates which version of a particular operand is currently being managed. It must always match the Available
+ // operand. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout
// 1.1.0
+ // +kubebuilder:validation:Required
+ // +required
Version string `json:"version"`
}
// ObjectReference contains enough information to let you inspect or modify the referred object.
type ObjectReference struct {
// group of the referent.
+ // +kubebuilder:validation:Required
+ // +required
Group string `json:"group"`
// resource of the referent.
+ // +kubebuilder:validation:Required
+ // +required
Resource string `json:"resource"`
// namespace of the referent.
// +optional
Namespace string `json:"namespace,omitempty"`
// name of the referent.
+ // +kubebuilder:validation:Required
+ // +required
Name string `json:"name"`
}
@@ -96,41 +107,64 @@ const (
)
// ClusterOperatorStatusCondition represents the state of the operator's
-// reconciliation functionality.
+// managed and monitored components.
// +k8s:deepcopy-gen=true
type ClusterOperatorStatusCondition struct {
- // type specifies the state of the operator's reconciliation functionality.
+ // type specifies the aspect reported by this condition.
+ // +kubebuilder:validation:Required
+ // +required
Type ClusterStatusConditionType `json:"type"`
// status of the condition, one of True, False, Unknown.
+ // +kubebuilder:validation:Required
+ // +required
Status ConditionStatus `json:"status"`
- // lastTransitionTime is the time of the last update to the current status object.
+ // lastTransitionTime is the time of the last update to the current status property.
+ // +kubebuilder:validation:Required
+ // +required
LastTransitionTime metav1.Time `json:"lastTransitionTime"`
- // reason is the reason for the condition's last transition. Reasons are CamelCase
+ // reason is the CamelCase reason for the condition's current status.
+ // +optional
Reason string `json:"reason,omitempty"`
// message provides additional information about the current condition.
// This is only to be consumed by humans.
+ // +optional
Message string `json:"message,omitempty"`
}
-// ClusterStatusConditionType is the state of the operator's reconciliation functionality.
+// ClusterStatusConditionType is an aspect of operator state.
type ClusterStatusConditionType string
const (
- // Available indicates that the binary maintained by the operator (eg: openshift-apiserver for the
+ // Available indicates that the operand (eg: openshift-apiserver for the
// openshift-apiserver-operator), is functional and available in the cluster.
OperatorAvailable ClusterStatusConditionType = "Available"
- // Progressing indicates that the operator is actively making changes to the binary maintained by the
- // operator (eg: openshift-apiserver for the openshift-apiserver-operator).
+ // Progressing indicates that the operator is actively rolling out new code,
+ // propagating config changes, or otherwise moving from one steady state to
+ // another. Operators should not report progressing when they are reconciling
+ // a previously known state.
OperatorProgressing ClusterStatusConditionType = "Progressing"
- // Degraded indicates that the operand is not functioning completely. An example of a degraded state
- // would be if there should be 5 copies of the operand running but only 4 are running. It may still be available,
- // but it is degraded
+ // Degraded indicates that the operator's current state does not match its
+ // desired state over a period of time resulting in a lower quality of service.
+ // The period of time may vary by component, but a Degraded state represents
+ // persistent observation of a condition. As a result, a component should not
+ // oscillate in and out of Degraded state. A service may be Available even
+ // if its degraded. For example, your service may desire 3 running pods, but 1
+ // pod is crash-looping. The service is Available but Degraded because it
+ // may have a lower quality of service. A component may be Progressing but
+ // not Degraded because the transition from one state to another does not
+ // persist over a long enough period to report Degraded. A service should not
+ // report Degraded during the course of a normal upgrade. A service may report
+ // Degraded in response to a persistent infrastructure failure that requires
+ // administrator intervention. For example, if a control plane host is unhealthy
+ // and must be replaced. An operator should report Degraded if unexpected
+ // errors occur over a period, but the expectation is that all unexpected errors
+ // are handled as operators mature.
OperatorDegraded ClusterStatusConditionType = "Degraded"
// Upgradeable indicates whether the operator is in a state that is safe to upgrade. When status is `False`
diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
index c6c2e7e43..771e962ad 100644
--- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
+++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go
@@ -33,6 +33,8 @@ type ClusterVersionSpec struct {
// clusterID uniquely identifies this cluster. This is expected to be
// an RFC4122 UUID value (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx in
// hexadecimal values). This is a required field.
+ // +kubebuilder:validation:Required
+ // +required
ClusterID ClusterID `json:"clusterID"`
// desiredUpdate is an optional field that indicates the desired value of
@@ -80,6 +82,8 @@ type ClusterVersionStatus struct {
// desired is the version that the cluster is reconciling towards.
// If the cluster is not yet fully initialized desired will be set
// with the information available, which may be an image or a tag.
+ // +kubebuilder:validation:Required
+ // +required
Desired Update `json:"desired"`
// history contains a list of the most recent versions applied to the cluster.
@@ -94,12 +98,16 @@ type ClusterVersionStatus struct {
// observedGeneration reports which version of the spec is being synced.
// If this value is not equal to metadata.generation, then the desired
- // and conditions fields may represent from a previous version.
+ // and conditions fields may represent a previous version.
+ // +kubebuilder:validation:Required
+ // +required
ObservedGeneration int64 `json:"observedGeneration"`
// versionHash is a fingerprint of the content that the cluster will be
// updated with. It is used by the operator to avoid unnecessary work
// and is for internal use only.
+ // +kubebuilder:validation:Required
+ // +required
VersionHash string `json:"versionHash"`
// conditions provides information about the cluster version. The condition
@@ -117,6 +125,8 @@ type ClusterVersionStatus struct {
// if the update service is unavailable, or if an invalid channel has
// been specified.
// +nullable
+ // +kubebuilder:validation:Required
+ // +required
AvailableUpdates []Update `json:"availableUpdates"`
}
@@ -139,14 +149,20 @@ type UpdateHistory struct {
// indicates the update is not fully applied, while the Completed state
// indicates the update was successfully rolled out at least once (all
// parts of the update successfully applied).
+ // +kubebuilder:validation:Required
+ // +required
State UpdateState `json:"state"`
// startedTime is the time at which the update was started.
+ // +kubebuilder:validation:Required
+ // +required
StartedTime metav1.Time `json:"startedTime"`
// completionTime, if set, is when the update was fully applied. The update
// that is currently being applied will have a null completion time.
// Completion time will always be set for entries that are not the current
// update (usually to the started time of the next update).
+ // +kubebuilder:validation:Required
+ // +required
// +nullable
CompletionTime *metav1.Time `json:"completionTime"`
@@ -158,9 +174,13 @@ type UpdateHistory struct {
Version string `json:"version"`
// image is a container image location that contains the update. This value
// is always populated.
+ // +kubebuilder:validation:Required
+ // +required
Image string `json:"image"`
// verified indicates whether the provided update was properly verified
// before it was installed. If this is false the cluster may not be trusted.
+ // +kubebuilder:validation:Required
+ // +required
Verified bool `json:"verified"`
}
@@ -172,19 +192,29 @@ type ClusterID string
// +k8s:deepcopy-gen=true
type ComponentOverride struct {
// kind indentifies which object to override.
+ // +kubebuilder:validation:Required
+ // +required
Kind string `json:"kind"`
// group identifies the API group that the kind is in.
+ // +kubebuilder:validation:Required
+ // +required
Group string `json:"group"`
// namespace is the component's namespace. If the resource is cluster
// scoped, the namespace should be empty.
+ // +kubebuilder:validation:Required
+ // +required
Namespace string `json:"namespace"`
// name is the component's name.
+ // +kubebuilder:validation:Required
+ // +required
Name string `json:"name"`
// unmanaged controls if cluster version operator should stop managing the
// resources in this cluster.
// Default: false
+ // +kubebuilder:validation:Required
+ // +required
Unmanaged bool `json:"unmanaged"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_console.go b/vendor/github.com/openshift/api/config/v1/types_console.go
index 9cda3f83b..22b0b5160 100644
--- a/vendor/github.com/openshift/api/config/v1/types_console.go
+++ b/vendor/github.com/openshift/api/config/v1/types_console.go
@@ -10,8 +10,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// logout URL, and reports the public URL of the console. The canonical name is
// `cluster`.
type Console struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -40,9 +39,9 @@ type ConsoleStatus struct {
type ConsoleList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Console `json:"items"`
+
+ Items []Console `json:"items"`
}
// ConsoleAuthentication defines a list of optional configuration for console authentication.
@@ -58,6 +57,6 @@ type ConsoleAuthentication struct {
// provides the user the option to perform single logout (SLO) through the identity
// provider to destroy their single sign-on session.
// +optional
- // +kubebuilder:validation:Pattern=^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$
+ // +kubebuilder:validation:Pattern=`^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$`
LogoutRedirect string `json:"logoutRedirect,omitempty"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_dns.go b/vendor/github.com/openshift/api/config/v1/types_dns.go
index ef04f7a67..989ef99c3 100644
--- a/vendor/github.com/openshift/api/config/v1/types_dns.go
+++ b/vendor/github.com/openshift/api/config/v1/types_dns.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// DNS holds cluster-wide information about DNS. The canonical name is `cluster`
type DNS struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -82,7 +81,7 @@ type DNSStatus struct {
type DNSList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []DNS `json:"items"`
+
+ Items []DNS `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_feature.go b/vendor/github.com/openshift/api/config/v1/types_feature.go
index 536bad191..ce9012627 100644
--- a/vendor/github.com/openshift/api/config/v1/types_feature.go
+++ b/vendor/github.com/openshift/api/config/v1/types_feature.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// Feature holds cluster-wide information about feature gates. The canonical name is `cluster`
type FeatureGate struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -35,6 +34,9 @@ var (
// Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations
// your cluster may fail in an unrecoverable way.
CustomNoUpgrade FeatureSet = "CustomNoUpgrade"
+
+ // TopologyManager enables ToplogyManager support. Upgrades are enabled with this feature.
+ LatencySensitive FeatureSet = "LatencySensitive"
)
type FeatureGateSpec struct {
@@ -73,9 +75,9 @@ type FeatureGateStatus struct {
type FeatureGateList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []FeatureGate `json:"items"`
+
+ Items []FeatureGate `json:"items"`
}
type FeatureGateEnabledDisabled struct {
@@ -95,24 +97,98 @@ type FeatureGateEnabledDisabled struct {
//
// If you put an item in either of these lists, put your area and name on it so we can find owners.
var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
- Default: {
- Enabled: []string{
- "ExperimentalCriticalPodAnnotation", // sig-pod, sjenning
- "RotateKubeletServerCertificate", // sig-pod, sjenning
- "SupportPodPidsLimit", // sig-pod, sjenning
- },
- Disabled: []string{
- "LocalStorageCapacityIsolation", // sig-pod, sjenning
- },
+ Default: defaultFeatures,
+ CustomNoUpgrade: {
+ Enabled: []string{},
+ Disabled: []string{},
+ },
+ TechPreviewNoUpgrade: newDefaultFeatures().toFeatures(),
+ LatencySensitive: newDefaultFeatures().
+ with(
+ "TopologyManager", // sig-pod, sjenning
+ ).
+ toFeatures(),
+}
+
+var defaultFeatures = &FeatureGateEnabledDisabled{
+ Enabled: []string{
+ "RotateKubeletServerCertificate", // sig-pod, sjenning
+ "SupportPodPidsLimit", // sig-pod, sjenning
+ "NodeDisruptionExclusion", // sig-scheduling, ccoleman
+ "ServiceNodeExclusion", // sig-scheduling, ccoleman
+ "SCTPSupport", // sig-network, ccallend
},
- TechPreviewNoUpgrade: {
- Enabled: []string{
- "ExperimentalCriticalPodAnnotation", // sig-pod, sjenning
- "RotateKubeletServerCertificate", // sig-pod, sjenning
- "SupportPodPidsLimit", // sig-pod, sjenning
- },
- Disabled: []string{
- "LocalStorageCapacityIsolation", // sig-pod, sjenning
- },
+ Disabled: []string{
+ "LegacyNodeRoleBehavior", // sig-scheduling, ccoleman
},
}
+
+type featureSetBuilder struct {
+ forceOn []string
+ forceOff []string
+}
+
+func newDefaultFeatures() *featureSetBuilder {
+ return &featureSetBuilder{}
+}
+
+func (f *featureSetBuilder) with(forceOn ...string) *featureSetBuilder {
+ f.forceOn = append(f.forceOn, forceOn...)
+ return f
+}
+
+func (f *featureSetBuilder) without(forceOff ...string) *featureSetBuilder {
+ f.forceOff = append(f.forceOff, forceOff...)
+ return f
+}
+
+func (f *featureSetBuilder) isForcedOff(needle string) bool {
+ for _, forcedOff := range f.forceOff {
+ if needle == forcedOff {
+ return true
+ }
+ }
+ return false
+}
+
+func (f *featureSetBuilder) isForcedOn(needle string) bool {
+ for _, forceOn := range f.forceOn {
+ if needle == forceOn {
+ return true
+ }
+ }
+ return false
+}
+
+func (f *featureSetBuilder) toFeatures() *FeatureGateEnabledDisabled {
+ finalOn := []string{}
+ finalOff := []string{}
+
+ // only add the default enabled features if they haven't been explicitly set off
+ for _, defaultOn := range defaultFeatures.Enabled {
+ if !f.isForcedOff(defaultOn) {
+ finalOn = append(finalOn, defaultOn)
+ }
+ }
+ for _, currOn := range f.forceOn {
+ if f.isForcedOff(currOn) {
+ panic("coding error, you can't have features both on and off")
+ }
+ finalOn = append(finalOn, currOn)
+ }
+
+ // only add the default disabled features if they haven't been explicitly set on
+ for _, defaultOff := range defaultFeatures.Disabled {
+ if !f.isForcedOn(defaultOff) {
+ finalOff = append(finalOff, defaultOff)
+ }
+ }
+ for _, currOff := range f.forceOff {
+ finalOff = append(finalOff, currOff)
+ }
+
+ return &FeatureGateEnabledDisabled{
+ Enabled: finalOn,
+ Disabled: finalOff,
+ }
+}
diff --git a/vendor/github.com/openshift/api/config/v1/types_image.go b/vendor/github.com/openshift/api/config/v1/types_image.go
index f0cf220d3..bf594c1b7 100644
--- a/vendor/github.com/openshift/api/config/v1/types_image.go
+++ b/vendor/github.com/openshift/api/config/v1/types_image.go
@@ -6,10 +6,14 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// Image holds cluster-wide information about how to handle images. The canonical name is `cluster`
+// Image governs policies related to imagestream imports and runtime configuration
+// for external registries. It allows cluster admins to configure which registries
+// OpenShift is allowed to import images from, extra CA trust bundles for external
+// registries, and policies to blacklist/whitelist registry hostnames.
+// When exposing OpenShift's image registry to the public, this also lets cluster
+// admins specify the external hostname.
type Image struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -22,7 +26,7 @@ type Image struct {
}
type ImageSpec struct {
- // AllowedRegistriesForImport limits the container image registries that normal users may import
+ // allowedRegistriesForImport limits the container image registries that normal users may import
// images from. Set this list to the registries that you trust to contain valid Docker
// images and that you want applications to be able to import from. Users with
// permission to create Images or ImageStreamMappings via the API are not affected by
@@ -38,14 +42,14 @@ type ImageSpec struct {
// +optional
ExternalRegistryHostnames []string `json:"externalRegistryHostnames,omitempty"`
- // AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that
- // should be trusted during imagestream import, pod image pull, and imageregistry
- // pullthrough.
+ // additionalTrustedCA is a reference to a ConfigMap containing additional CAs that
+ // should be trusted during imagestream import, pod image pull, build image pull, and
+ // imageregistry pullthrough.
// The namespace for this config map is openshift-config.
// +optional
AdditionalTrustedCA ConfigMapNameReference `json:"additionalTrustedCA"`
- // RegistrySources contains configuration that determines how the container runtime
+ // registrySources contains configuration that determines how the container runtime
// should treat individual registries when accessing images for builds+pods. (e.g.
// whether or not to allow insecure access). It does not contain configuration for the
// internal cluster registry.
@@ -55,10 +59,10 @@ type ImageSpec struct {
type ImageStatus struct {
- // this value is set by the image registry operator which controls the internal registry hostname
- // InternalRegistryHostname sets the hostname for the default internal image
+ // internalRegistryHostname sets the hostname for the default internal image
// registry. The value must be in "hostname[:port]" format.
- // For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
+ // This value is set by the image registry operator which controls the internal registry
+ // hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
// environment variable but this setting overrides the environment variable.
// +optional
InternalRegistryHostname string `json:"internalRegistryHostname,omitempty"`
@@ -75,19 +79,19 @@ type ImageStatus struct {
type ImageList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Image `json:"items"`
+
+ Items []Image `json:"items"`
}
// RegistryLocation contains a location of the registry specified by the registry domain
// name. The domain name might include wildcards, like '*' or '??'.
type RegistryLocation struct {
- // DomainName specifies a domain name for the registry
+ // domainName specifies a domain name for the registry
// In case the registry use non-standard (80 or 443) port, the port should be included
// in the domain name as well.
DomainName string `json:"domainName"`
- // Insecure indicates whether the registry is secure (https) or insecure (http)
+ // insecure indicates whether the registry is secure (https) or insecure (http)
// By default (if not specified) the registry is assumed as secure.
// +optional
Insecure bool `json:"insecure,omitempty"`
@@ -95,15 +99,15 @@ type RegistryLocation struct {
// RegistrySources holds cluster-wide information about how to handle the registries config.
type RegistrySources struct {
- // InsecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.
+ // insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.
// +optional
InsecureRegistries []string `json:"insecureRegistries,omitempty"`
- // BlockedRegistries are blacklisted from image pull/push. All other registries are allowed.
+ // blockedRegistries are blacklisted from image pull/push. All other registries are allowed.
//
// Only one of BlockedRegistries or AllowedRegistries may be set.
// +optional
BlockedRegistries []string `json:"blockedRegistries,omitempty"`
- // AllowedRegistries are whitelisted for image pull/push. All other registries are blocked.
+ // allowedRegistries are whitelisted for image pull/push. All other registries are blocked.
//
// Only one of BlockedRegistries or AllowedRegistries may be set.
// +optional
diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
index 4632e6ada..ac1e5048e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
+++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster`
type Infrastructure struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -130,6 +129,10 @@ type PlatformStatus struct {
// OpenStack contains settings specific to the OpenStack infrastructure provider.
// +optional
OpenStack *OpenStackPlatformStatus `json:"openstack,omitempty"`
+
+ // Ovirt contains settings specific to the oVirt infrastructure provider.
+ // +optional
+ Ovirt *OvirtPlatformStatus `json:"ovirt,omitempty"`
}
// AWSPlatformStatus holds the current status of the Amazon Web Services infrastructure provider.
@@ -142,6 +145,11 @@ type AWSPlatformStatus struct {
type AzurePlatformStatus struct {
// resourceGroupName is the Resource Group for new Azure resources created for the cluster.
ResourceGroupName string `json:"resourceGroupName"`
+
+ // networkResourceGroupName is the Resource Group for network resources like the Virtual Network and Subnets used by the cluster.
+ // If empty, the value is same as ResourceGroupName.
+ // +optional
+ NetworkResourceGroupName string `json:"networkResourceGroupName,omitempty"`
}
// GCPPlatformStatus holds the current status of the Google Cloud Platform infrastructure provider.
@@ -154,6 +162,8 @@ type GCPPlatformStatus struct {
}
// BareMetalPlatformStatus holds the current status of the BareMetal infrastructure provider.
+// For more information about the network architecture used with the BareMetal platform type, see:
+// https://github.com/openshift/installer/blob/master/docs/design/baremetal/networking-infrastructure.md
type BareMetalPlatformStatus struct {
// apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used
// by components inside the cluster, like kubelets using the infrastructure rather
@@ -199,12 +209,33 @@ type OpenStackPlatformStatus struct {
NodeDNSIP string `json:"nodeDNSIP,omitempty"`
}
+// OvirtPlatformStatus holds the current status of the oVirt infrastructure provider.
+type OvirtPlatformStatus struct {
+ // apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used
+ // by components inside the cluster, like kubelets using the infrastructure rather
+ // than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI
+ // points to. It is the IP for a self-hosted load balancer in front of the API servers.
+ APIServerInternalIP string `json:"apiServerInternalIP,omitempty"`
+
+ // ingressIP is an external IP which routes to the default ingress controller.
+ // The IP is a suitable target of a wildcard DNS record used to resolve default route host names.
+ IngressIP string `json:"ingressIP,omitempty"`
+
+ // nodeDNSIP is the IP address for the internal DNS used by the
+ // nodes. Unlike the one managed by the DNS operator, `NodeDNSIP`
+ // provides name resolution for the nodes themselves. There is no DNS-as-a-service for
+ // oVirt deployments. In order to minimize necessary changes to the
+ // datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames
+ // to the nodes in the cluster.
+ NodeDNSIP string `json:"nodeDNSIP,omitempty"`
+}
+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// InfrastructureList is
type InfrastructureList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Infrastructure `json:"items"`
+
+ Items []Infrastructure `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_ingress.go b/vendor/github.com/openshift/api/config/v1/types_ingress.go
index 484a1af0b..0216919ad 100644
--- a/vendor/github.com/openshift/api/config/v1/types_ingress.go
+++ b/vendor/github.com/openshift/api/config/v1/types_ingress.go
@@ -6,11 +6,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// Ingress holds cluster-wide information about Ingress. The canonical name is `cluster`
-// TODO this object is an example of a possible grouping and is subject to change or removal
+// Ingress holds cluster-wide information about ingress, including the default ingress domain
+// used for routes. The canonical name is `cluster`.
type Ingress struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -24,8 +23,13 @@ type Ingress struct {
type IngressSpec struct {
// domain is used to generate a default host name for a route when the
- // route's host name is empty. The generated host name will follow this
+ // route's host name is empty. The generated host name will follow this
// pattern: "<route-name>.<route-namespace>.<domain>".
+ //
+ // It is also used as the default wildcard domain suffix for ingress. The
+ // default ingresscontroller domain will follow this pattern: "*.<domain>".
+ //
+ // Once set, changing domain is not currently supported.
Domain string `json:"domain"`
}
@@ -36,7 +40,7 @@ type IngressStatus struct {
type IngressList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Ingress `json:"items"`
+
+ Items []Ingress `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_network.go b/vendor/github.com/openshift/api/config/v1/types_network.go
index a60c5f7dc..a09c5fe8e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_network.go
+++ b/vendor/github.com/openshift/api/config/v1/types_network.go
@@ -6,14 +6,16 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// Network holds cluster-wide information about Network. The canonical name is `cluster`
-// TODO this object is an example of a possible grouping and is subject to change or removal
+// Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc.
+// Please view network.spec for an explanation on what applies when configuring this resource.
type Network struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration.
+ // As a general rule, this SHOULD NOT be read directly. Instead, you should
+ // consume the NetworkStatus, as it indicates the currently deployed configuration.
+ // Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.
// +kubebuilder:validation:Required
// +required
Spec NetworkSpec `json:"spec"`
@@ -25,14 +27,15 @@ type Network struct {
// NetworkSpec is the desired network configuration.
// As a general rule, this SHOULD NOT be read directly. Instead, you should
// consume the NetworkStatus, as it indicates the currently deployed configuration.
-// Currently, changing ClusterNetwork, ServiceNetwork, or NetworkType after
-// installation is not supported.
+// Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.
type NetworkSpec struct {
// IP address pool to use for pod IPs.
+ // This field is immutable after installation.
ClusterNetwork []ClusterNetworkEntry `json:"clusterNetwork"`
// IP address pool for services.
// Currently, we only support a single entry here.
+ // This field is immutable after installation.
ServiceNetwork []string `json:"serviceNetwork"`
// NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN).
@@ -40,10 +43,12 @@ type NetworkSpec struct {
// or else no networking will be installed.
// Currently supported values are:
// - OpenShiftSDN
+ // This field is immutable after installation.
NetworkType string `json:"networkType"`
// externalIP defines configuration for controllers that
- // affect Service.ExternalIP
+ // affect Service.ExternalIP. If nil, then ExternalIP is
+ // not allowed to be set.
// +optional
ExternalIP *ExternalIPConfig `json:"externalIP,omitempty"`
}
@@ -71,6 +76,7 @@ type ClusterNetworkEntry struct {
CIDR string `json:"cidr"`
// The size (prefix) of block to allocate to each node.
+ // +kubebuilder:validation:Minimum=0
HostPrefix uint32 `json:"hostPrefix"`
}
@@ -78,8 +84,7 @@ type ClusterNetworkEntry struct {
// of a Service resource.
type ExternalIPConfig struct {
// policy is a set of restrictions applied to the ExternalIP field.
- // If nil, any value is allowed for an ExternalIP. If the empty/zero
- // policy is supplied, then ExternalIP is not allowed to be set.
+ // If nil or empty, then ExternalIP is not allowed to be set.
// +optional
Policy *ExternalIPPolicy `json:"policy,omitempty"`
@@ -111,7 +116,7 @@ type ExternalIPPolicy struct {
type NetworkList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Network `json:"items"`
+
+ Items []Network `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_operatorhub.go b/vendor/github.com/openshift/api/config/v1/types_operatorhub.go
index cf821f9e3..1d998bf37 100644
--- a/vendor/github.com/openshift/api/config/v1/types_operatorhub.go
+++ b/vendor/github.com/openshift/api/config/v1/types_operatorhub.go
@@ -6,10 +6,19 @@ import (
// OperatorHubSpec defines the desired state of OperatorHub
type OperatorHubSpec struct {
+ // disableAllDefaultSources allows you to disable all the default hub
+ // sources. If this is true, a specific entry in sources can be used to
+ // enable a default source. If this is false, a specific entry in
+ // sources can be used to disable or enable a default source.
+ // +optional
+ DisableAllDefaultSources bool `json:"disableAllDefaultSources,omitempty"`
// sources is the list of default hub sources and their configuration.
- // If the list is empty, it indicates that the default hub sources are
- // enabled on the cluster. The list of default hub sources and their
- // current state will always be reflected in the status block.
+ // If the list is empty, it implies that the default hub sources are
+ // enabled on the cluster unless disableAllDefaultSources is true.
+ // If disableAllDefaultSources is true and sources is not empty,
+ // the configuration present in sources will take precedence. The list of
+ // default hub sources and their current state will always be reflected in
+ // the status block.
// +optional
Sources []HubSource `json:"sources,omitempty"`
}
@@ -61,9 +70,9 @@ type HubSource struct {
// HubSourceStatus is used to reflect the current state of applying the
// configuration to a default source
type HubSourceStatus struct {
- HubSource
+ HubSource `json:",omitempty"`
// status indicates success or failure in applying the configuration
- Status string `json:"status"`
+ Status string `json:"status,omitempty"`
// message provides more information regarding failures
Message string `json:"message,omitempty"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_project.go b/vendor/github.com/openshift/api/config/v1/types_project.go
index 61152a6f7..244ce3ef8 100644
--- a/vendor/github.com/openshift/api/config/v1/types_project.go
+++ b/vendor/github.com/openshift/api/config/v1/types_project.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// Project holds cluster-wide information about Project. The canonical name is `cluster`
type Project struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -49,7 +48,7 @@ type ProjectStatus struct {
type ProjectList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Project `json:"items"`
+
+ Items []Project `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_proxy.go b/vendor/github.com/openshift/api/config/v1/types_proxy.go
index 1413a48ca..93f4c487e 100644
--- a/vendor/github.com/openshift/api/config/v1/types_proxy.go
+++ b/vendor/github.com/openshift/api/config/v1/types_proxy.go
@@ -12,6 +12,7 @@ import (
type Proxy struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
+
// Spec holds user-settable values for the proxy configuration
// +kubebuilder:validation:Required
// +required
@@ -83,7 +84,7 @@ type ProxyStatus struct {
type ProxyList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Proxy `json:"items"`
+
+ Items []Proxy `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_scheduling.go b/vendor/github.com/openshift/api/config/v1/types_scheduling.go
index 9b8fa3a52..d5bf0c362 100644
--- a/vendor/github.com/openshift/api/config/v1/types_scheduling.go
+++ b/vendor/github.com/openshift/api/config/v1/types_scheduling.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
// Scheduler holds cluster-wide config information to run the Kubernetes Scheduler
// and influence its placement decisions. The canonical name for this config is `cluster`.
type Scheduler struct {
- metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
+ metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// spec holds user settable values for configuration
@@ -69,7 +68,7 @@ type SchedulerStatus struct {
type SchedulerList struct {
metav1.TypeMeta `json:",inline"`
- // Standard object's metadata.
metav1.ListMeta `json:"metadata"`
- Items []Scheduler `json:"items"`
+
+ Items []Scheduler `json:"items"`
}
diff --git a/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go b/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go
new file mode 100644
index 000000000..ea788dc16
--- /dev/null
+++ b/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go
@@ -0,0 +1,260 @@
+package v1
+
+// TLSSecurityProfile defines the schema for a TLS security profile. This object
+// is used by operators to apply TLS security settings to operands.
+// +union
+type TLSSecurityProfile struct {
+ // type is one of Old, Intermediate, Modern or Custom. Custom provides
+ // the ability to specify individual TLS security profile parameters.
+ // Old, Intermediate and Modern are TLS security profiles based on:
+ //
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations
+ //
+ // The profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers
+ // are found to be insecure. Depending on precisely which ciphers are available to a process, the list may be
+ // reduced.
+ //
+ // Note that the Modern profile is currently not supported because it is not
+ // yet well adopted by common software libraries.
+ //
+ // +unionDiscriminator
+ // +optional
+ Type TLSProfileType `json:"type"`
+ // old is a TLS security profile based on:
+ //
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
+ //
+ // and looks like this (yaml):
+ //
+ // ciphers:
+ // - TLS_AES_128_GCM_SHA256
+ // - TLS_AES_256_GCM_SHA384
+ // - TLS_CHACHA20_POLY1305_SHA256
+ // - ECDHE-ECDSA-AES128-GCM-SHA256
+ // - ECDHE-RSA-AES128-GCM-SHA256
+ // - ECDHE-ECDSA-AES256-GCM-SHA384
+ // - ECDHE-RSA-AES256-GCM-SHA384
+ // - ECDHE-ECDSA-CHACHA20-POLY1305
+ // - ECDHE-RSA-CHACHA20-POLY1305
+ // - DHE-RSA-AES128-GCM-SHA256
+ // - DHE-RSA-AES256-GCM-SHA384
+ // - DHE-RSA-CHACHA20-POLY1305
+ // - ECDHE-ECDSA-AES128-SHA256
+ // - ECDHE-RSA-AES128-SHA256
+ // - ECDHE-ECDSA-AES128-SHA
+ // - ECDHE-RSA-AES128-SHA
+ // - ECDHE-ECDSA-AES256-SHA384
+ // - ECDHE-RSA-AES256-SHA384
+ // - ECDHE-ECDSA-AES256-SHA
+ // - ECDHE-RSA-AES256-SHA
+ // - DHE-RSA-AES128-SHA256
+ // - DHE-RSA-AES256-SHA256
+ // - AES128-GCM-SHA256
+ // - AES256-GCM-SHA384
+ // - AES128-SHA256
+ // - AES256-SHA256
+ // - AES128-SHA
+ // - AES256-SHA
+ // - DES-CBC3-SHA
+ // minTLSVersion: TLSv1.0
+ //
+ // +optional
+ // +nullable
+ Old *OldTLSProfile `json:"old,omitempty"`
+ // intermediate is a TLS security profile based on:
+ //
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
+ //
+ // and looks like this (yaml):
+ //
+ // ciphers:
+ // - TLS_AES_128_GCM_SHA256
+ // - TLS_AES_256_GCM_SHA384
+ // - TLS_CHACHA20_POLY1305_SHA256
+ // - ECDHE-ECDSA-AES128-GCM-SHA256
+ // - ECDHE-RSA-AES128-GCM-SHA256
+ // - ECDHE-ECDSA-AES256-GCM-SHA384
+ // - ECDHE-RSA-AES256-GCM-SHA384
+ // - ECDHE-ECDSA-CHACHA20-POLY1305
+ // - ECDHE-RSA-CHACHA20-POLY1305
+ // - DHE-RSA-AES128-GCM-SHA256
+ // - DHE-RSA-AES256-GCM-SHA384
+ // minTLSVersion: TLSv1.2
+ //
+ // +optional
+ // +nullable
+ Intermediate *IntermediateTLSProfile `json:"intermediate,omitempty"`
+ // modern is a TLS security profile based on:
+ //
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
+ //
+ // and looks like this (yaml):
+ //
+ // ciphers:
+ // - TLS_AES_128_GCM_SHA256
+ // - TLS_AES_256_GCM_SHA384
+ // - TLS_CHACHA20_POLY1305_SHA256
+ // minTLSVersion: TLSv1.3
+ //
+ // NOTE: Currently unsupported.
+ //
+ // +optional
+ // +nullable
+ Modern *ModernTLSProfile `json:"modern,omitempty"`
+ // custom is a user-defined TLS security profile. Be extremely careful using a custom
+ // profile as invalid configurations can be catastrophic. An example custom profile
+ // looks like this:
+ //
+ // ciphers:
+ // - ECDHE-ECDSA-CHACHA20-POLY1305
+ // - ECDHE-RSA-CHACHA20-POLY1305
+ // - ECDHE-RSA-AES128-GCM-SHA256
+ // - ECDHE-ECDSA-AES128-GCM-SHA256
+ // minTLSVersion: TLSv1.1
+ //
+ // +optional
+ // +nullable
+ Custom *CustomTLSProfile `json:"custom,omitempty"`
+}
+
+// OldTLSProfile is a TLS security profile based on:
+// https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
+type OldTLSProfile struct{}
+
+// IntermediateTLSProfile is a TLS security profile based on:
+// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29
+type IntermediateTLSProfile struct{}
+
+// ModernTLSProfile is a TLS security profile based on:
+// https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
+type ModernTLSProfile struct{}
+
+// CustomTLSProfile is a user-defined TLS security profile. Be extremely careful
+// using a custom TLS profile as invalid configurations can be catastrophic.
+type CustomTLSProfile struct {
+ TLSProfileSpec `json:",inline"`
+}
+
+// TLSProfileType defines a TLS security profile type.
+type TLSProfileType string
+
+const (
+ // Old is a TLS security profile based on:
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
+ TLSProfileOldType TLSProfileType = "Old"
+ // Intermediate is a TLS security profile based on:
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29
+ TLSProfileIntermediateType TLSProfileType = "Intermediate"
+ // Modern is a TLS security profile based on:
+ // https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
+ TLSProfileModernType TLSProfileType = "Modern"
+ // Custom is a TLS security profile that allows for user-defined parameters.
+ TLSProfileCustomType TLSProfileType = "Custom"
+)
+
+// TLSProfileSpec is the desired behavior of a TLSSecurityProfile.
+type TLSProfileSpec struct {
+ // ciphers is used to specify the cipher algorithms that are negotiated
+ // during the TLS handshake. Operators may remove entries their operands
+ // do not support. For example, to use DES-CBC3-SHA (yaml):
+ //
+ // ciphers:
+ // - DES-CBC3-SHA
+ //
+ Ciphers []string `json:"ciphers"`
+ // minTLSVersion is used to specify the minimal version of the TLS protocol
+ // that is negotiated during the TLS handshake. For example, to use TLS
+ // versions 1.1, 1.2 and 1.3 (yaml):
+ //
+ // minTLSVersion: TLSv1.1
+ //
+ // NOTE: currently the highest minTLSVersion allowed is VersionTLS12
+ //
+ MinTLSVersion TLSProtocolVersion `json:"minTLSVersion"`
+}
+
+// TLSProtocolVersion is a way to specify the protocol version used for TLS connections.
+// Protocol versions are based on the following most common TLS configurations:
+//
+// https://ssl-config.mozilla.org/
+//
+// Note that SSLv3.0 is not a supported protocol version due to well known
+// vulnerabilities such as POODLE: https://en.wikipedia.org/wiki/POODLE
+type TLSProtocolVersion string
+
+const (
+ // VersionTLSv10 is version 1.0 of the TLS security protocol.
+ VersionTLS10 TLSProtocolVersion = "VersionTLS10"
+ // VersionTLSv11 is version 1.1 of the TLS security protocol.
+ VersionTLS11 TLSProtocolVersion = "VersionTLS11"
+ // VersionTLSv12 is version 1.2 of the TLS security protocol.
+ VersionTLS12 TLSProtocolVersion = "VersionTLS12"
+ // VersionTLSv13 is version 1.3 of the TLS security protocol.
+ VersionTLS13 TLSProtocolVersion = "VersionTLS13"
+)
+
+// TLSProfiles Contains a map of TLSProfileType names to TLSProfileSpec.
+//
+// NOTE: The caller needs to make sure to check that these constants are valid for their binary. Not all
+// entries map to values for all binaries. In the case of ties, the kube-apiserver wins. Do not fail,
+// just be sure to whitelist only and everything will be ok.
+var TLSProfiles = map[TLSProfileType]*TLSProfileSpec{
+ TLSProfileOldType: {
+ Ciphers: []string{
+ "TLS_AES_128_GCM_SHA256",
+ "TLS_AES_256_GCM_SHA384",
+ "TLS_CHACHA20_POLY1305_SHA256",
+ "ECDHE-ECDSA-AES128-GCM-SHA256",
+ "ECDHE-RSA-AES128-GCM-SHA256",
+ "ECDHE-ECDSA-AES256-GCM-SHA384",
+ "ECDHE-RSA-AES256-GCM-SHA384",
+ "ECDHE-ECDSA-CHACHA20-POLY1305",
+ "ECDHE-RSA-CHACHA20-POLY1305",
+ "DHE-RSA-AES128-GCM-SHA256",
+ "DHE-RSA-AES256-GCM-SHA384",
+ "DHE-RSA-CHACHA20-POLY1305",
+ "ECDHE-ECDSA-AES128-SHA256",
+ "ECDHE-RSA-AES128-SHA256",
+ "ECDHE-ECDSA-AES128-SHA",
+ "ECDHE-RSA-AES128-SHA",
+ "ECDHE-ECDSA-AES256-SHA384",
+ "ECDHE-RSA-AES256-SHA384",
+ "ECDHE-ECDSA-AES256-SHA",
+ "ECDHE-RSA-AES256-SHA",
+ "DHE-RSA-AES128-SHA256",
+ "DHE-RSA-AES256-SHA256",
+ "AES128-GCM-SHA256",
+ "AES256-GCM-SHA384",
+ "AES128-SHA256",
+ "AES256-SHA256",
+ "AES128-SHA",
+ "AES256-SHA",
+ "DES-CBC3-SHA",
+ },
+ MinTLSVersion: VersionTLS10,
+ },
+ TLSProfileIntermediateType: {
+ Ciphers: []string{
+ "TLS_AES_128_GCM_SHA256",
+ "TLS_AES_256_GCM_SHA384",
+ "TLS_CHACHA20_POLY1305_SHA256",
+ "ECDHE-ECDSA-AES128-GCM-SHA256",
+ "ECDHE-RSA-AES128-GCM-SHA256",
+ "ECDHE-ECDSA-AES256-GCM-SHA384",
+ "ECDHE-RSA-AES256-GCM-SHA384",
+ "ECDHE-ECDSA-CHACHA20-POLY1305",
+ "ECDHE-RSA-CHACHA20-POLY1305",
+ "DHE-RSA-AES128-GCM-SHA256",
+ "DHE-RSA-AES256-GCM-SHA384",
+ },
+ MinTLSVersion: VersionTLS12,
+ },
+ TLSProfileModernType: {
+ Ciphers: []string{
+ "TLS_AES_128_GCM_SHA256",
+ "TLS_AES_256_GCM_SHA384",
+ "TLS_CHACHA20_POLY1305_SHA256",
+ },
+ MinTLSVersion: VersionTLS13,
+ },
+}
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
index 3d44627f9..37888a939 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
@@ -38,10 +38,26 @@ func (in *APIServer) DeepCopyObject() runtime.Object {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *APIServerEncryption) DeepCopyInto(out *APIServerEncryption) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerEncryption.
+func (in *APIServerEncryption) DeepCopy() *APIServerEncryption {
+ if in == nil {
+ return nil
+ }
+ out := new(APIServerEncryption)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *APIServerList) DeepCopyInto(out *APIServerList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]APIServer, len(*in))
@@ -125,6 +141,12 @@ func (in *APIServerSpec) DeepCopyInto(out *APIServerSpec) {
*out = make([]string, len(*in))
copy(*out, *in)
}
+ out.Encryption = in.Encryption
+ if in.TLSSecurityProfile != nil {
+ in, out := &in.TLSSecurityProfile, &out.TLSSecurityProfile
+ *out = new(TLSSecurityProfile)
+ (*in).DeepCopyInto(*out)
+ }
return
}
@@ -269,7 +291,7 @@ func (in *Authentication) DeepCopyObject() runtime.Object {
func (in *AuthenticationList) DeepCopyInto(out *AuthenticationList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Authentication, len(*in))
@@ -456,7 +478,7 @@ func (in *BuildDefaults) DeepCopy() *BuildDefaults {
func (in *BuildList) DeepCopyInto(out *BuildList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Build, len(*in))
@@ -619,7 +641,7 @@ func (in *ClusterOperator) DeepCopyObject() runtime.Object {
func (in *ClusterOperatorList) DeepCopyInto(out *ClusterOperatorList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]ClusterOperator, len(*in))
@@ -747,7 +769,7 @@ func (in *ClusterVersion) DeepCopyObject() runtime.Object {
func (in *ClusterVersionList) DeepCopyInto(out *ClusterVersionList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]ClusterVersion, len(*in))
@@ -934,7 +956,7 @@ func (in *ConsoleAuthentication) DeepCopy() *ConsoleAuthentication {
func (in *ConsoleList) DeepCopyInto(out *ConsoleList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Console, len(*in))
@@ -1023,6 +1045,23 @@ func (in *CustomFeatureGates) DeepCopy() *CustomFeatureGates {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CustomTLSProfile) DeepCopyInto(out *CustomTLSProfile) {
+ *out = *in
+ in.TLSProfileSpec.DeepCopyInto(&out.TLSProfileSpec)
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CustomTLSProfile.
+func (in *CustomTLSProfile) DeepCopy() *CustomTLSProfile {
+ if in == nil {
+ return nil
+ }
+ out := new(CustomTLSProfile)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DNS) DeepCopyInto(out *DNS) {
*out = *in
out.TypeMeta = in.TypeMeta
@@ -1054,7 +1093,7 @@ func (in *DNS) DeepCopyObject() runtime.Object {
func (in *DNSList) DeepCopyInto(out *DNSList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]DNS, len(*in))
@@ -1329,7 +1368,7 @@ func (in *FeatureGateEnabledDisabled) DeepCopy() *FeatureGateEnabledDisabled {
func (in *FeatureGateList) DeepCopyInto(out *FeatureGateList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]FeatureGate, len(*in))
@@ -1730,7 +1769,7 @@ func (in *ImageLabel) DeepCopy() *ImageLabel {
func (in *ImageList) DeepCopyInto(out *ImageList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Image, len(*in))
@@ -1840,7 +1879,7 @@ func (in *Infrastructure) DeepCopyObject() runtime.Object {
func (in *InfrastructureList) DeepCopyInto(out *InfrastructureList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Infrastructure, len(*in))
@@ -1939,7 +1978,7 @@ func (in *Ingress) DeepCopyObject() runtime.Object {
func (in *IngressList) DeepCopyInto(out *IngressList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Ingress, len(*in))
@@ -2001,6 +2040,22 @@ func (in *IngressStatus) DeepCopy() *IngressStatus {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *IntermediateTLSProfile) DeepCopyInto(out *IntermediateTLSProfile) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IntermediateTLSProfile.
+func (in *IntermediateTLSProfile) DeepCopy() *IntermediateTLSProfile {
+ if in == nil {
+ return nil
+ }
+ out := new(IntermediateTLSProfile)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *KeystoneIdentityProvider) DeepCopyInto(out *KeystoneIdentityProvider) {
*out = *in
out.OAuthRemoteConnectionInfo = in.OAuthRemoteConnectionInfo
@@ -2109,6 +2164,22 @@ func (in *LeaderElection) DeepCopy() *LeaderElection {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ModernTLSProfile) DeepCopyInto(out *ModernTLSProfile) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ModernTLSProfile.
+func (in *ModernTLSProfile) DeepCopy() *ModernTLSProfile {
+ if in == nil {
+ return nil
+ }
+ out := new(ModernTLSProfile)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *NamedCertificate) DeepCopyInto(out *NamedCertificate) {
*out = *in
if in.Names != nil {
@@ -2162,7 +2233,7 @@ func (in *Network) DeepCopyObject() runtime.Object {
func (in *NetworkList) DeepCopyInto(out *NetworkList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Network, len(*in))
@@ -2280,7 +2351,7 @@ func (in *OAuth) DeepCopyObject() runtime.Object {
func (in *OAuthList) DeepCopyInto(out *OAuthList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]OAuth, len(*in))
@@ -2405,6 +2476,22 @@ func (in *ObjectReference) DeepCopy() *ObjectReference {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OldTLSProfile) DeepCopyInto(out *OldTLSProfile) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OldTLSProfile.
+func (in *OldTLSProfile) DeepCopy() *OldTLSProfile {
+ if in == nil {
+ return nil
+ }
+ out := new(OldTLSProfile)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *OpenIDClaims) DeepCopyInto(out *OpenIDClaims) {
*out = *in
if in.PreferredUsername != nil {
@@ -2530,7 +2617,7 @@ func (in *OperatorHub) DeepCopyObject() runtime.Object {
func (in *OperatorHubList) DeepCopyInto(out *OperatorHubList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]OperatorHub, len(*in))
@@ -2602,6 +2689,22 @@ func (in *OperatorHubStatus) DeepCopy() *OperatorHubStatus {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OvirtPlatformStatus) DeepCopyInto(out *OvirtPlatformStatus) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OvirtPlatformStatus.
+func (in *OvirtPlatformStatus) DeepCopy() *OvirtPlatformStatus {
+ if in == nil {
+ return nil
+ }
+ out := new(OvirtPlatformStatus)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PlatformStatus) DeepCopyInto(out *PlatformStatus) {
*out = *in
if in.AWS != nil {
@@ -2629,6 +2732,11 @@ func (in *PlatformStatus) DeepCopyInto(out *PlatformStatus) {
*out = new(OpenStackPlatformStatus)
**out = **in
}
+ if in.Ovirt != nil {
+ in, out := &in.Ovirt, &out.Ovirt
+ *out = new(OvirtPlatformStatus)
+ **out = **in
+ }
return
}
@@ -2674,7 +2782,7 @@ func (in *Project) DeepCopyObject() runtime.Object {
func (in *ProjectList) DeepCopyInto(out *ProjectList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Project, len(*in))
@@ -2768,7 +2876,7 @@ func (in *Proxy) DeepCopyObject() runtime.Object {
func (in *ProxyList) DeepCopyInto(out *ProxyList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Proxy, len(*in))
@@ -2973,7 +3081,7 @@ func (in *Scheduler) DeepCopyObject() runtime.Object {
func (in *SchedulerList) DeepCopyInto(out *SchedulerList) {
*out = *in
out.TypeMeta = in.TypeMeta
- out.ListMeta = in.ListMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Scheduler, len(*in))
@@ -3114,6 +3222,63 @@ func (in *StringSourceSpec) DeepCopy() *StringSourceSpec {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLSProfileSpec) DeepCopyInto(out *TLSProfileSpec) {
+ *out = *in
+ if in.Ciphers != nil {
+ in, out := &in.Ciphers, &out.Ciphers
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSProfileSpec.
+func (in *TLSProfileSpec) DeepCopy() *TLSProfileSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(TLSProfileSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLSSecurityProfile) DeepCopyInto(out *TLSSecurityProfile) {
+ *out = *in
+ if in.Old != nil {
+ in, out := &in.Old, &out.Old
+ *out = new(OldTLSProfile)
+ **out = **in
+ }
+ if in.Intermediate != nil {
+ in, out := &in.Intermediate, &out.Intermediate
+ *out = new(IntermediateTLSProfile)
+ **out = **in
+ }
+ if in.Modern != nil {
+ in, out := &in.Modern, &out.Modern
+ *out = new(ModernTLSProfile)
+ **out = **in
+ }
+ if in.Custom != nil {
+ in, out := &in.Custom, &out.Custom
+ *out = new(CustomTLSProfile)
+ (*in).DeepCopyInto(*out)
+ }
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSSecurityProfile.
+func (in *TLSSecurityProfile) DeepCopy() *TLSSecurityProfile {
+ if in == nil {
+ return nil
+ }
+ out := new(TLSSecurityProfile)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *TemplateReference) DeepCopyInto(out *TemplateReference) {
*out = *in
return
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
index 6bd877a4f..2d6b19d2d 100644
--- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
+++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
@@ -251,6 +251,14 @@ func (APIServer) SwaggerDoc() map[string]string {
return map_APIServer
}
+var map_APIServerEncryption = map[string]string{
+ "type": "type defines what encryption type should be used to encrypt resources at the datastore layer. When this field is unset (i.e. when it is set to the empty string), identity is implied. The behavior of unset can and will change over time. Even if encryption is enabled by default, the meaning of unset may change to a different encryption type based on changes in best practices.\n\nWhen encryption is enabled, all sensitive resources shipped with the platform are encrypted. This list of sensitive resources can and will change over time. The current authoritative list is:\n\n 1. secrets\n 2. configmaps\n 3. routes.route.openshift.io\n 4. oauthaccesstokens.oauth.openshift.io\n 5. oauthauthorizetokens.oauth.openshift.io",
+}
+
+func (APIServerEncryption) SwaggerDoc() map[string]string {
+ return map_APIServerEncryption
+}
+
var map_APIServerNamedServingCert = map[string]string{
"": "APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate.",
"names": "names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names.",
@@ -273,6 +281,8 @@ var map_APIServerSpec = map[string]string{
"servingCerts": "servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates will be used for serving secure traffic.",
"clientCA": "clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. You usually only have to set this if you have your own PKI you wish to honor client certificates from. The ConfigMap must exist in the openshift-config namespace and contain the following required fields: - ConfigMap.Data[\"ca-bundle.crt\"] - CA bundle.",
"additionalCORSAllowedOrigins": "additionalCORSAllowedOrigins lists additional, user-defined regular expressions describing hosts for which the API server allows access using the CORS headers. This may be needed to access the API and the integrated OAuth server from JavaScript applications. The values are regular expressions that correspond to the Golang regular expression language.",
+ "encryption": "encryption allows the configuration of encryption of resources at the datastore layer.",
+ "tlsSecurityProfile": "tlsSecurityProfile specifies settings for TLS connections for externally exposed servers.\n\nIf unset, a default (which may change between releases) is chosen. Note that only Old and Intermediate profiles are currently supported, and the maximum available MinTLSVersions is VersionTLS12.",
}
func (APIServerSpec) SwaggerDoc() map[string]string {
@@ -280,24 +290,15 @@ func (APIServerSpec) SwaggerDoc() map[string]string {
}
var map_Authentication = map[string]string{
- "": "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Authentication) SwaggerDoc() map[string]string {
return map_Authentication
}
-var map_AuthenticationList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (AuthenticationList) SwaggerDoc() map[string]string {
- return map_AuthenticationList
-}
-
var map_AuthenticationSpec = map[string]string{
"type": "type identifies the cluster managed, user facing authentication mode in use. Specifically, it manages the component that responds to login attempts. The default is IntegratedOAuth.",
"oauthMetadata": "oauthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for an external OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 If oauthMetadata.name is non-empty, this value has precedence over any metadata reference stored in status. The key \"oauthMetadata\" is used to locate the data. If specified and the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config.",
@@ -326,7 +327,7 @@ func (WebhookTokenAuthenticator) SwaggerDoc() map[string]string {
}
var map_Build = map[string]string{
- "": "Build holds cluster-wide information on how to handle builds. The canonical name is `cluster`",
+ "": "Build configures the behavior of OpenShift builds for the entire cluster. This includes default settings that can be overridden in BuildConfig objects, and overrides which are applied to all builds.\n\nThe canonical name is \"cluster\"",
"spec": "Spec holds user-settable values for the build controller configuration",
}
@@ -346,14 +347,6 @@ func (BuildDefaults) SwaggerDoc() map[string]string {
return map_BuildDefaults
}
-var map_BuildList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (BuildList) SwaggerDoc() map[string]string {
- return map_BuildList
-}
-
var map_BuildOverrides = map[string]string{
"imageLabels": "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.",
"nodeSelector": "NodeSelector is a selector which must be true for the build pod to fit on a node",
@@ -365,7 +358,7 @@ func (BuildOverrides) SwaggerDoc() map[string]string {
}
var map_BuildSpec = map[string]string{
- "additionalTrustedCA": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.",
+ "additionalTrustedCA": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during builds. The namespace for this config map is openshift-config.\n\nDEPRECATED: Additional CAs for image pull and push should be set on image.config.openshift.io/cluster instead.",
"buildDefaults": "BuildDefaults controls the default information for Builds",
"buildOverrides": "BuildOverrides controls override settings for builds",
}
@@ -385,8 +378,8 @@ func (ImageLabel) SwaggerDoc() map[string]string {
var map_ClusterOperator = map[string]string{
"": "ClusterOperator is the Custom Resource object which holds the current state of an operator. This object is used by operators to convey their state to the rest of the cluster.",
- "spec": "spec hold the intent of how this operator should behave.",
- "status": "status holds the information about the state of an operator. It is consistent with status information across the kube ecosystem.",
+ "spec": "spec holds configuration that could apply to any operator.",
+ "status": "status holds the information about the state of an operator. It is consistent with status information across the Kubernetes ecosystem.",
}
func (ClusterOperator) SwaggerDoc() map[string]string {
@@ -411,8 +404,8 @@ func (ClusterOperatorSpec) SwaggerDoc() map[string]string {
var map_ClusterOperatorStatus = map[string]string{
"": "ClusterOperatorStatus provides information about the status of the operator.",
- "conditions": "conditions describes the state of the operator's reconciliation functionality.",
- "versions": "versions is a slice of operand version tuples. Operators which manage multiple operands will have multiple entries in the array. If an operator is Available, it must have at least one entry. You must report the version of the operator itself with the name \"operator\".",
+ "conditions": "conditions describes the state of the operator's managed and monitored components.",
+ "versions": "versions is a slice of operator and operand version tuples. Operators which manage multiple operands will have multiple operand entries in the array. Available operators must report the version of the operator itself with the name \"operator\". An operator reports a new \"operator\" version when it has rolled out the new version to all of its operands.",
"relatedObjects": "relatedObjects is a list of objects that are \"interesting\" or related to this operator. Common uses are: 1. the detailed resource driving the operator 2. operator namespaces 3. operand namespaces",
"extension": "extension contains any additional status information specific to the operator which owns this status object.",
}
@@ -422,11 +415,11 @@ func (ClusterOperatorStatus) SwaggerDoc() map[string]string {
}
var map_ClusterOperatorStatusCondition = map[string]string{
- "": "ClusterOperatorStatusCondition represents the state of the operator's reconciliation functionality.",
- "type": "type specifies the state of the operator's reconciliation functionality.",
+ "": "ClusterOperatorStatusCondition represents the state of the operator's managed and monitored components.",
+ "type": "type specifies the aspect reported by this condition.",
"status": "status of the condition, one of True, False, Unknown.",
- "lastTransitionTime": "lastTransitionTime is the time of the last update to the current status object.",
- "reason": "reason is the reason for the condition's last transition. Reasons are CamelCase",
+ "lastTransitionTime": "lastTransitionTime is the time of the last update to the current status property.",
+ "reason": "reason is the CamelCase reason for the condition's current status.",
"message": "message provides additional information about the current condition. This is only to be consumed by humans.",
}
@@ -448,7 +441,7 @@ func (ObjectReference) SwaggerDoc() map[string]string {
var map_OperandVersion = map[string]string{
"name": "name is the name of the particular operand this version is for. It usually matches container images, not operators.",
- "version": "version indicates which version of a particular operand is currently being manage. It must always match the Available condition. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout 1.1.0",
+ "version": "version indicates which version of a particular operand is currently being managed. It must always match the Available operand. If 1.0.0 is Available, then this must indicate 1.0.0 even if the operator is trying to rollout 1.1.0",
}
func (OperandVersion) SwaggerDoc() map[string]string {
@@ -490,7 +483,7 @@ var map_ClusterVersionStatus = map[string]string{
"": "ClusterVersionStatus reports the status of the cluster versioning, including any upgrades that are in progress. The current field will be set to whichever version the cluster is reconciling to, and the conditions array will report whether the update succeeded, is in progress, or is failing.",
"desired": "desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.",
"history": "history contains a list of the most recent versions applied to the cluster. This value may be empty during cluster startup, and then will be updated when a new update is being applied. The newest update is first in the list and it is ordered by recency. Updates in the history have state Completed if the rollout completed - if an update was failing or halfway applied the state will be Partial. Only a limited amount of update history is preserved.",
- "observedGeneration": "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent from a previous version.",
+ "observedGeneration": "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent a previous version.",
"versionHash": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.",
"conditions": "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Degraded\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.",
"availableUpdates": "availableUpdates contains the list of updates that are appropriate for this cluster. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.",
@@ -539,10 +532,9 @@ func (UpdateHistory) SwaggerDoc() map[string]string {
}
var map_Console = map[string]string{
- "": "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Console) SwaggerDoc() map[string]string {
@@ -558,14 +550,6 @@ func (ConsoleAuthentication) SwaggerDoc() map[string]string {
return map_ConsoleAuthentication
}
-var map_ConsoleList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (ConsoleList) SwaggerDoc() map[string]string {
- return map_ConsoleList
-}
-
var map_ConsoleSpec = map[string]string{
"": "ConsoleSpec is the specification of the desired behavior of the Console.",
}
@@ -584,24 +568,15 @@ func (ConsoleStatus) SwaggerDoc() map[string]string {
}
var map_DNS = map[string]string{
- "": "DNS holds cluster-wide information about DNS. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "DNS holds cluster-wide information about DNS. The canonical name is `cluster`",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (DNS) SwaggerDoc() map[string]string {
return map_DNS
}
-var map_DNSList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (DNSList) SwaggerDoc() map[string]string {
- return map_DNSList
-}
-
var map_DNSSpec = map[string]string{
"baseDomain": "baseDomain is the base domain of the cluster. All managed DNS records will be sub-domains of this base.\n\nFor example, given the base domain `openshift.example.com`, an API server DNS record may be created for `cluster-api.openshift.example.com`.\n\nOnce set, this field cannot be changed.",
"publicZone": "publicZone is the location where all the DNS records that are publicly accessible to the internet exist.\n\nIf this field is nil, no public records should be created.\n\nOnce set, this field cannot be changed.",
@@ -632,24 +607,15 @@ func (CustomFeatureGates) SwaggerDoc() map[string]string {
}
var map_FeatureGate = map[string]string{
- "": "Feature holds cluster-wide information about feature gates. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Feature holds cluster-wide information about feature gates. The canonical name is `cluster`",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (FeatureGate) SwaggerDoc() map[string]string {
return map_FeatureGate
}
-var map_FeatureGateList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (FeatureGateList) SwaggerDoc() map[string]string {
- return map_FeatureGateList
-}
-
var map_FeatureGateSelection = map[string]string{
"featureSet": "featureSet changes the list of features in the cluster. The default is empty. Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.",
"customNoUpgrade": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated. If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way. featureSet must equal \"CustomNoUpgrade\" must be set to use this field.",
@@ -660,29 +626,20 @@ func (FeatureGateSelection) SwaggerDoc() map[string]string {
}
var map_Image = map[string]string{
- "": "Image holds cluster-wide information about how to handle images. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Image governs policies related to imagestream imports and runtime configuration for external registries. It allows cluster admins to configure which registries OpenShift is allowed to import images from, extra CA trust bundles for external registries, and policies to blacklist/whitelist registry hostnames. When exposing OpenShift's image registry to the public, this also lets cluster admins specify the external hostname.",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Image) SwaggerDoc() map[string]string {
return map_Image
}
-var map_ImageList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (ImageList) SwaggerDoc() map[string]string {
- return map_ImageList
-}
-
var map_ImageSpec = map[string]string{
- "allowedRegistriesForImport": "AllowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.",
+ "allowedRegistriesForImport": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.",
"externalRegistryHostnames": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.",
- "additionalTrustedCA": "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted during imagestream import, pod image pull, and imageregistry pullthrough. The namespace for this config map is openshift-config.",
- "registrySources": "RegistrySources contains configuration that determines how the container runtime should treat individual registries when accessing images for builds+pods. (e.g. whether or not to allow insecure access). It does not contain configuration for the internal cluster registry.",
+ "additionalTrustedCA": "additionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted during imagestream import, pod image pull, build image pull, and imageregistry pullthrough. The namespace for this config map is openshift-config.",
+ "registrySources": "registrySources contains configuration that determines how the container runtime should treat individual registries when accessing images for builds+pods. (e.g. whether or not to allow insecure access). It does not contain configuration for the internal cluster registry.",
}
func (ImageSpec) SwaggerDoc() map[string]string {
@@ -690,7 +647,7 @@ func (ImageSpec) SwaggerDoc() map[string]string {
}
var map_ImageStatus = map[string]string{
- "internalRegistryHostname": "this value is set by the image registry operator which controls the internal registry hostname InternalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
+ "internalRegistryHostname": "internalRegistryHostname sets the hostname for the default internal image registry. The value must be in \"hostname[:port]\" format. This value is set by the image registry operator which controls the internal registry hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY environment variable but this setting overrides the environment variable.",
"externalRegistryHostnames": "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.",
}
@@ -700,8 +657,8 @@ func (ImageStatus) SwaggerDoc() map[string]string {
var map_RegistryLocation = map[string]string{
"": "RegistryLocation contains a location of the registry specified by the registry domain name. The domain name might include wildcards, like '*' or '??'.",
- "domainName": "DomainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.",
- "insecure": "Insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.",
+ "domainName": "domainName specifies a domain name for the registry In case the registry use non-standard (80 or 443) port, the port should be included in the domain name as well.",
+ "insecure": "insecure indicates whether the registry is secure (https) or insecure (http) By default (if not specified) the registry is assumed as secure.",
}
func (RegistryLocation) SwaggerDoc() map[string]string {
@@ -710,9 +667,9 @@ func (RegistryLocation) SwaggerDoc() map[string]string {
var map_RegistrySources = map[string]string{
"": "RegistrySources holds cluster-wide information about how to handle the registries config.",
- "insecureRegistries": "InsecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.",
- "blockedRegistries": "BlockedRegistries are blacklisted from image pull/push. All other registries are allowed.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.",
- "allowedRegistries": "AllowedRegistries are whitelisted for image pull/push. All other registries are blocked.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.",
+ "insecureRegistries": "insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.",
+ "blockedRegistries": "blockedRegistries are blacklisted from image pull/push. All other registries are allowed.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.",
+ "allowedRegistries": "allowedRegistries are whitelisted for image pull/push. All other registries are blocked.\n\nOnly one of BlockedRegistries or AllowedRegistries may be set.",
}
func (RegistrySources) SwaggerDoc() map[string]string {
@@ -729,8 +686,9 @@ func (AWSPlatformStatus) SwaggerDoc() map[string]string {
}
var map_AzurePlatformStatus = map[string]string{
- "": "AzurePlatformStatus holds the current status of the Azure infrastructure provider.",
- "resourceGroupName": "resourceGroupName is the Resource Group for new Azure resources created for the cluster.",
+ "": "AzurePlatformStatus holds the current status of the Azure infrastructure provider.",
+ "resourceGroupName": "resourceGroupName is the Resource Group for new Azure resources created for the cluster.",
+ "networkResourceGroupName": "networkResourceGroupName is the Resource Group for network resources like the Virtual Network and Subnets used by the cluster. If empty, the value is same as ResourceGroupName.",
}
func (AzurePlatformStatus) SwaggerDoc() map[string]string {
@@ -738,7 +696,7 @@ func (AzurePlatformStatus) SwaggerDoc() map[string]string {
}
var map_BareMetalPlatformStatus = map[string]string{
- "": "BareMetalPlatformStatus holds the current status of the BareMetal infrastructure provider.",
+ "": "BareMetalPlatformStatus holds the current status of the BareMetal infrastructure provider. For more information about the network architecture used with the BareMetal platform type, see: https://github.com/openshift/installer/blob/master/docs/design/baremetal/networking-infrastructure.md",
"apiServerInternalIP": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.",
"ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.",
"nodeDNSIP": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for BareMetal deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.",
@@ -759,10 +717,9 @@ func (GCPPlatformStatus) SwaggerDoc() map[string]string {
}
var map_Infrastructure = map[string]string{
- "": "Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster`",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Infrastructure) SwaggerDoc() map[string]string {
@@ -770,8 +727,7 @@ func (Infrastructure) SwaggerDoc() map[string]string {
}
var map_InfrastructureList = map[string]string{
- "": "InfrastructureList is",
- "metadata": "Standard object's metadata.",
+ "": "InfrastructureList is",
}
func (InfrastructureList) SwaggerDoc() map[string]string {
@@ -813,6 +769,17 @@ func (OpenStackPlatformStatus) SwaggerDoc() map[string]string {
return map_OpenStackPlatformStatus
}
+var map_OvirtPlatformStatus = map[string]string{
+ "": "OvirtPlatformStatus holds the current status of the oVirt infrastructure provider.",
+ "apiServerInternalIP": "apiServerInternalIP is an IP address to contact the Kubernetes API server that can be used by components inside the cluster, like kubelets using the infrastructure rather than Kubernetes networking. It is the IP that the Infrastructure.status.apiServerInternalURI points to. It is the IP for a self-hosted load balancer in front of the API servers.",
+ "ingressIP": "ingressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names.",
+ "nodeDNSIP": "nodeDNSIP is the IP address for the internal DNS used by the nodes. Unlike the one managed by the DNS operator, `NodeDNSIP` provides name resolution for the nodes themselves. There is no DNS-as-a-service for oVirt deployments. In order to minimize necessary changes to the datacenter DNS, a DNS service is hosted as a static pod to serve those hostnames to the nodes in the cluster.",
+}
+
+func (OvirtPlatformStatus) SwaggerDoc() map[string]string {
+ return map_OvirtPlatformStatus
+}
+
var map_PlatformStatus = map[string]string{
"": "PlatformStatus holds the current status specific to the underlying infrastructure provider of the current cluster. Since these are used at status-level for the underlying cluster, it is supposed that only one of the status structs is set.",
"type": "type is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"BareMetal\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", \"oVirt\", and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.",
@@ -821,6 +788,7 @@ var map_PlatformStatus = map[string]string{
"gcp": "GCP contains settings specific to the Google Cloud Platform infrastructure provider.",
"baremetal": "BareMetal contains settings specific to the BareMetal platform.",
"openstack": "OpenStack contains settings specific to the OpenStack infrastructure provider.",
+ "ovirt": "Ovirt contains settings specific to the oVirt infrastructure provider.",
}
func (PlatformStatus) SwaggerDoc() map[string]string {
@@ -828,26 +796,17 @@ func (PlatformStatus) SwaggerDoc() map[string]string {
}
var map_Ingress = map[string]string{
- "": "Ingress holds cluster-wide information about Ingress. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Ingress holds cluster-wide information about ingress, including the default ingress domain used for routes. The canonical name is `cluster`.",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Ingress) SwaggerDoc() map[string]string {
return map_Ingress
}
-var map_IngressList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (IngressList) SwaggerDoc() map[string]string {
- return map_IngressList
-}
-
var map_IngressSpec = map[string]string{
- "domain": "domain is used to generate a default host name for a route when the route's host name is empty. The generated host name will follow this pattern: \"<route-name>.<route-namespace>.<domain>\".",
+ "domain": "domain is used to generate a default host name for a route when the route's host name is empty. The generated host name will follow this pattern: \"<route-name>.<route-namespace>.<domain>\".\n\nIt is also used as the default wildcard domain suffix for ingress. The default ingresscontroller domain will follow this pattern: \"*.<domain>\".\n\nOnce set, changing domain is not currently supported.",
}
func (IngressSpec) SwaggerDoc() map[string]string {
@@ -866,7 +825,7 @@ func (ClusterNetworkEntry) SwaggerDoc() map[string]string {
var map_ExternalIPConfig = map[string]string{
"": "ExternalIPConfig specifies some IP blocks relevant for the ExternalIP field of a Service resource.",
- "policy": "policy is a set of restrictions applied to the ExternalIP field. If nil, any value is allowed for an ExternalIP. If the empty/zero policy is supplied, then ExternalIP is not allowed to be set.",
+ "policy": "policy is a set of restrictions applied to the ExternalIP field. If nil or empty, then ExternalIP is not allowed to be set.",
"autoAssignCIDRs": "autoAssignCIDRs is a list of CIDRs from which to automatically assign Service.ExternalIP. These are assigned when the service is of type LoadBalancer. In general, this is only useful for bare-metal clusters. In Openshift 3.x, this was misleadingly called \"IngressIPs\". Automatically assigned External IPs are not affected by any ExternalIPPolicy rules. Currently, only one entry may be provided.",
}
@@ -885,30 +844,21 @@ func (ExternalIPPolicy) SwaggerDoc() map[string]string {
}
var map_Network = map[string]string{
- "": "Network holds cluster-wide information about Network. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration.",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. Please view network.spec for an explanation on what applies when configuring this resource.",
+ "spec": "spec holds user settable values for configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Network) SwaggerDoc() map[string]string {
return map_Network
}
-var map_NetworkList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (NetworkList) SwaggerDoc() map[string]string {
- return map_NetworkList
-}
-
var map_NetworkSpec = map[string]string{
- "": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, changing ClusterNetwork, ServiceNetwork, or NetworkType after installation is not supported.",
- "clusterNetwork": "IP address pool to use for pod IPs.",
- "serviceNetwork": "IP address pool for services. Currently, we only support a single entry here.",
- "networkType": "NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN",
- "externalIP": "externalIP defines configuration for controllers that affect Service.ExternalIP",
+ "": "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.",
+ "clusterNetwork": "IP address pool to use for pod IPs. This field is immutable after installation.",
+ "serviceNetwork": "IP address pool for services. Currently, we only support a single entry here. This field is immutable after installation.",
+ "networkType": "NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN This field is immutable after installation.",
+ "externalIP": "externalIP defines configuration for controllers that affect Service.ExternalIP. If nil, then ExternalIP is not allowed to be set.",
}
func (NetworkSpec) SwaggerDoc() map[string]string {
@@ -1183,8 +1133,9 @@ func (OperatorHubList) SwaggerDoc() map[string]string {
}
var map_OperatorHubSpec = map[string]string{
- "": "OperatorHubSpec defines the desired state of OperatorHub",
- "sources": "sources is the list of default hub sources and their configuration. If the list is empty, it indicates that the default hub sources are enabled on the cluster. The list of default hub sources and their current state will always be reflected in the status block.",
+ "": "OperatorHubSpec defines the desired state of OperatorHub",
+ "disableAllDefaultSources": "disableAllDefaultSources allows you to disable all the default hub sources. If this is true, a specific entry in sources can be used to enable a default source. If this is false, a specific entry in sources can be used to disable or enable a default source.",
+ "sources": "sources is the list of default hub sources and their configuration. If the list is empty, it implies that the default hub sources are enabled on the cluster unless disableAllDefaultSources is true. If disableAllDefaultSources is true and sources is not empty, the configuration present in sources will take precedence. The list of default hub sources and their current state will always be reflected in the status block.",
}
func (OperatorHubSpec) SwaggerDoc() map[string]string {
@@ -1201,24 +1152,15 @@ func (OperatorHubStatus) SwaggerDoc() map[string]string {
}
var map_Project = map[string]string{
- "": "Project holds cluster-wide information about Project. The canonical name is `cluster`",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Project holds cluster-wide information about Project. The canonical name is `cluster`",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Project) SwaggerDoc() map[string]string {
return map_Project
}
-var map_ProjectList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (ProjectList) SwaggerDoc() map[string]string {
- return map_ProjectList
-}
-
var map_ProjectSpec = map[string]string{
"": "ProjectSpec holds the project creation configuration.",
"projectRequestMessage": "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint",
@@ -1248,14 +1190,6 @@ func (Proxy) SwaggerDoc() map[string]string {
return map_Proxy
}
-var map_ProxyList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (ProxyList) SwaggerDoc() map[string]string {
- return map_ProxyList
-}
-
var map_ProxySpec = map[string]string{
"": "ProxySpec contains cluster proxy creation configuration.",
"httpProxy": "httpProxy is the URL of the proxy for HTTP requests. Empty means unset and will not result in an env var.",
@@ -1281,24 +1215,15 @@ func (ProxyStatus) SwaggerDoc() map[string]string {
}
var map_Scheduler = map[string]string{
- "": "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.",
- "metadata": "Standard object's metadata.",
- "spec": "spec holds user settable values for configuration",
- "status": "status holds observed values from the cluster. They may not be overridden.",
+ "": "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.",
+ "spec": "spec holds user settable values for configuration",
+ "status": "status holds observed values from the cluster. They may not be overridden.",
}
func (Scheduler) SwaggerDoc() map[string]string {
return map_Scheduler
}
-var map_SchedulerList = map[string]string{
- "metadata": "Standard object's metadata.",
-}
-
-func (SchedulerList) SwaggerDoc() map[string]string {
- return map_SchedulerList
-}
-
var map_SchedulerSpec = map[string]string{
"policy": "policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.",
"defaultNodeSelector": "defaultNodeSelector helps set the cluster-wide default node selector to restrict pod placement to specific nodes. This is applied to the pods created in all namespaces without a specified nodeSelector value. For example, defaultNodeSelector: \"type=user-node,region=east\" would set nodeSelector field in pod spec to \"type=user-node,region=east\" to all pods created in all namespaces. Namespaces having project-wide node selectors won't be impacted even if this field is set. This adds an annotation section to the namespace. For example, if a new namespace is created with node-selector='type=user-node,region=east', the annotation openshift.io/node-selector: type=user-node,region=east gets added to the project. When the openshift.io/node-selector annotation is set on the project the value is used in preference to the value we are setting for defaultNodeSelector field. For instance, openshift.io/node-selector: \"type=user-node,region=west\" means that the default of \"type=user-node,region=east\" set in defaultNodeSelector would not be applied.",
@@ -1309,4 +1234,59 @@ func (SchedulerSpec) SwaggerDoc() map[string]string {
return map_SchedulerSpec
}
+var map_CustomTLSProfile = map[string]string{
+ "": "CustomTLSProfile is a user-defined TLS security profile. Be extremely careful using a custom TLS profile as invalid configurations can be catastrophic.",
+}
+
+func (CustomTLSProfile) SwaggerDoc() map[string]string {
+ return map_CustomTLSProfile
+}
+
+var map_IntermediateTLSProfile = map[string]string{
+ "": "IntermediateTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29",
+}
+
+func (IntermediateTLSProfile) SwaggerDoc() map[string]string {
+ return map_IntermediateTLSProfile
+}
+
+var map_ModernTLSProfile = map[string]string{
+ "": "ModernTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility",
+}
+
+func (ModernTLSProfile) SwaggerDoc() map[string]string {
+ return map_ModernTLSProfile
+}
+
+var map_OldTLSProfile = map[string]string{
+ "": "OldTLSProfile is a TLS security profile based on: https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility",
+}
+
+func (OldTLSProfile) SwaggerDoc() map[string]string {
+ return map_OldTLSProfile
+}
+
+var map_TLSProfileSpec = map[string]string{
+ "": "TLSProfileSpec is the desired behavior of a TLSSecurityProfile.",
+ "ciphers": "ciphers is used to specify the cipher algorithms that are negotiated during the TLS handshake. Operators may remove entries their operands do not support. For example, to use DES-CBC3-SHA (yaml):\n\n ciphers:\n - DES-CBC3-SHA",
+ "minTLSVersion": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n minTLSVersion: TLSv1.1\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12",
+}
+
+func (TLSProfileSpec) SwaggerDoc() map[string]string {
+ return map_TLSProfileSpec
+}
+
+var map_TLSSecurityProfile = map[string]string{
+ "": "TLSSecurityProfile defines the schema for a TLS security profile. This object is used by operators to apply TLS security settings to operands.",
+ "type": "type is one of Old, Intermediate, Modern or Custom. Custom provides the ability to specify individual TLS security profile parameters. Old, Intermediate and Modern are TLS security profiles based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations\n\nThe profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers are found to be insecure. Depending on precisely which ciphers are available to a process, the list may be reduced.\n\nNote that the Modern profile is currently not supported because it is not yet well adopted by common software libraries.",
+ "old": "old is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n - TLS_AES_128_GCM_SHA256\n - TLS_AES_256_GCM_SHA384\n - TLS_CHACHA20_POLY1305_SHA256\n - ECDHE-ECDSA-AES128-GCM-SHA256\n - ECDHE-RSA-AES128-GCM-SHA256\n - ECDHE-ECDSA-AES256-GCM-SHA384\n - ECDHE-RSA-AES256-GCM-SHA384\n - ECDHE-ECDSA-CHACHA20-POLY1305\n - ECDHE-RSA-CHACHA20-POLY1305\n - DHE-RSA-AES128-GCM-SHA256\n - DHE-RSA-AES256-GCM-SHA384\n - DHE-RSA-CHACHA20-POLY1305\n - ECDHE-ECDSA-AES128-SHA256\n - ECDHE-RSA-AES128-SHA256\n - ECDHE-ECDSA-AES128-SHA\n - ECDHE-RSA-AES128-SHA\n - ECDHE-ECDSA-AES256-SHA384\n - ECDHE-RSA-AES256-SHA384\n - ECDHE-ECDSA-AES256-SHA\n - ECDHE-RSA-AES256-SHA\n - DHE-RSA-AES128-SHA256\n - DHE-RSA-AES256-SHA256\n - AES128-GCM-SHA256\n - AES256-GCM-SHA384\n - AES128-SHA256\n - AES256-SHA256\n - AES128-SHA\n - AES256-SHA\n - DES-CBC3-SHA\n minTLSVersion: TLSv1.0",
+ "intermediate": "intermediate is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29\n\nand looks like this (yaml):\n\n ciphers:\n - TLS_AES_128_GCM_SHA256\n - TLS_AES_256_GCM_SHA384\n - TLS_CHACHA20_POLY1305_SHA256\n - ECDHE-ECDSA-AES128-GCM-SHA256\n - ECDHE-RSA-AES128-GCM-SHA256\n - ECDHE-ECDSA-AES256-GCM-SHA384\n - ECDHE-RSA-AES256-GCM-SHA384\n - ECDHE-ECDSA-CHACHA20-POLY1305\n - ECDHE-RSA-CHACHA20-POLY1305\n - DHE-RSA-AES128-GCM-SHA256\n - DHE-RSA-AES256-GCM-SHA384\n minTLSVersion: TLSv1.2",
+ "modern": "modern is a TLS security profile based on:\n\nhttps://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility\n\nand looks like this (yaml):\n\n ciphers:\n - TLS_AES_128_GCM_SHA256\n - TLS_AES_256_GCM_SHA384\n - TLS_CHACHA20_POLY1305_SHA256\n minTLSVersion: TLSv1.3\n\nNOTE: Currently unsupported.",
+ "custom": "custom is a user-defined TLS security profile. Be extremely careful using a custom profile as invalid configurations can be catastrophic. An example custom profile looks like this:\n\n ciphers:\n - ECDHE-ECDSA-CHACHA20-POLY1305\n - ECDHE-RSA-CHACHA20-POLY1305\n - ECDHE-RSA-AES128-GCM-SHA256\n - ECDHE-ECDSA-AES128-GCM-SHA256\n minTLSVersion: TLSv1.1",
+}
+
+func (TLSSecurityProfile) SwaggerDoc() map[string]string {
+ return map_TLSSecurityProfile
+}
+
// AUTO-GENERATED FUNCTIONS END HERE
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ebac0089b..8fa756fbb 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -408,7 +408,7 @@ github.com/opencontainers/runtime-tools/validate
# github.com/opencontainers/selinux v1.3.0
github.com/opencontainers/selinux/go-selinux
github.com/opencontainers/selinux/go-selinux/label
-# github.com/openshift/api v3.9.1-0.20190810003144-27fb16909b15+incompatible
+# github.com/openshift/api v0.0.0-20200106203948-7ab22a2c8316
github.com/openshift/api/config/v1
# github.com/openshift/imagebuilder v1.1.1
github.com/openshift/imagebuilder