Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Prepare v0.17.0 release #1041

Merged
merged 1 commit into from
Dec 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kind-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
nodes:
- role: control-plane
image: sonobuoy/kind-node:v1.16.0
image: sonobuoy/kind-node:v1.17.0
- role: worker
replicas: 2
image: sonobuoy/kind-node:v1.16.0
image: sonobuoy/kind-node:v1.17.0
6 changes: 3 additions & 3 deletions pkg/buildinfo/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ limitations under the License.
package buildinfo

// Version is the current version of Sonobuoy, set by the go linker's -X flag at build time
var Version = "v0.16.5"
var Version = "v0.17.0"

// GitSHA is the actual commit that is being built, set by the go linker's -X flag at build time.
var GitSHA string

// MinimumKubeVersion is the lowest API version of Kubernetes this release of Sonobuoy supports.
var MinimumKubeVersion = "1.14.0"
var MinimumKubeVersion = "1.15.0"

// MaximumKubeVersion is the highest API version of Kubernetes this release of Sonobuoy supports.
var MaximumKubeVersion = "1.16.99"
var MaximumKubeVersion = "1.17.99"
24 changes: 24 additions & 0 deletions pkg/image/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
)

const (
dockerGluster = "docker.io/gluster"
dockerLibraryRegistry = "docker.io/library"
e2eRegistry = "gcr.io/kubernetes-e2e-test-images"
etcdRegistry = "quay.io/coreos"
Expand All @@ -33,12 +34,14 @@ const (
googleContainerRegistry = "gcr.io/google-containers"
invalidRegistry = "invalid.com/invalid"
privateRegistry = "gcr.io/k8s-authenticated-test"
quayIncubator = "quay.io/kubernetes_incubator"
quayK8sCSI = "quay.io/k8scsi"
sampleRegistry = "gcr.io/google-samples"
)

// RegistryList holds public and private image registries
type RegistryList struct {
DockerGluster string `yaml:"dockerGluster,omitempty"`
DockerLibraryRegistry string `yaml:"dockerLibraryRegistry,omitempty"`
E2eRegistry string `yaml:"e2eRegistry,omitempty"`
EtcdRegistry string `yaml:"etcdRegistry,omitempty"`
Expand All @@ -48,6 +51,7 @@ type RegistryList struct {
GoogleContainerRegistry string `yaml:"googleContainerRegistry,omitempty"`
InvalidRegistry string `yaml:"invalidRegistry,omitempty"`
PrivateRegistry string `yaml:"privateRegistry,omitempty"`
QuayIncubator string `yaml:"quayIncubator,omitempty"`
QuayK8sCSI string `yaml:"quayK8sCSI,omitempty"`
SampleRegistry string `yaml:"sampleRegistry,omitempty"`

Expand All @@ -65,6 +69,7 @@ type Config struct {
// NewRegistryList returns a default registry or one that matches a config file passed
func NewRegistryList(repoConfig, k8sVersion string) (*RegistryList, error) {
registry := &RegistryList{
DockerGluster: dockerGluster,
DockerLibraryRegistry: dockerLibraryRegistry,
E2eRegistry: e2eRegistry,
EtcdRegistry: etcdRegistry,
Expand All @@ -74,6 +79,7 @@ func NewRegistryList(repoConfig, k8sVersion string) (*RegistryList, error) {
GoogleContainerRegistry: googleContainerRegistry,
InvalidRegistry: invalidRegistry,
PrivateRegistry: privateRegistry,
QuayIncubator: quayIncubator,
QuayK8sCSI: quayK8sCSI,
SampleRegistry: sampleRegistry,
}
Expand Down Expand Up @@ -116,6 +122,8 @@ func (r *RegistryList) GetImageConfigs() (map[string]Config, error) {
return r.v1_15(), nil
case 16:
return r.v1_16(), nil
case 17:
return r.v1_17(), nil
}
}
return map[string]Config{}, fmt.Errorf("No matching configuration for k8s version: %v", r.K8sVersion)
Expand Down Expand Up @@ -162,6 +170,22 @@ func GetDefaultImageRegistries(version string) (*RegistryList, error) {
// InvalidRegistry: invalidRegistry,
// GcAuthenticatedRegistry: gcAuthenticatedRegistry,
}, nil
case 17:
return &RegistryList{
E2eRegistry: e2eRegistry,
DockerLibraryRegistry: dockerLibraryRegistry,
GcRegistry: gcRegistry,
GoogleContainerRegistry: googleContainerRegistry,
DockerGluster: dockerGluster,
QuayIncubator: quayIncubator,

// The following keys are used in the v1.17 registry list however their images
// cannot be pulled as they are used as part of tests for checking image pull
// behavior. They are omitted from the resulting config.
// InvalidRegistry: invalidRegistry,
// GcAuthenticatedRegistry: gcAuthenticatedRegistry,
// PrivateRegistry: privateRegistry,
}, nil
}
}
return nil, fmt.Errorf("No matching configuration for k8s version: %v", v)
Expand Down
76 changes: 76 additions & 0 deletions pkg/image/v1.17.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// NOTE: This is manually replicated from: https://github.com/kubernetes/kubernetes/blob/v1.17.0/test/utils/image/manifest.go#L210-L253

package image

func (r *RegistryList) v1_17() map[string]Config {

e2eRegistry := r.E2eRegistry
dockerLibraryRegistry := r.DockerLibraryRegistry
gcRegistry := r.GcRegistry
gcAuthenticatedRegistry := r.GcAuthenticatedRegistry
googleContainerRegistry := r.GoogleContainerRegistry
invalidRegistry := r.InvalidRegistry
privateRegistry := r.PrivateRegistry
dockerGluster := r.DockerGluster
quayIncubator := r.QuayIncubator

configs := map[string]Config{}
configs["Agnhost"] = Config{e2eRegistry, "agnhost", "2.8"}
configs["AgnhostPrivate"] = Config{privateRegistry, "agnhost", "2.6"}
configs["AuthenticatedAlpine"] = Config{gcAuthenticatedRegistry, "alpine", "3.7"}
configs["AuthenticatedWindowsNanoServer"] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"}
configs["APIServer"] = Config{e2eRegistry, "sample-apiserver", "1.10"}
configs["AppArmorLoader"] = Config{e2eRegistry, "apparmor-loader", "1.0"}
configs["BusyBox"] = Config{dockerLibraryRegistry, "busybox", "1.29"}
configs["CheckMetadataConcealment"] = Config{e2eRegistry, "metadata-concealment", "1.2"}
configs["CudaVectorAdd"] = Config{e2eRegistry, "cuda-vector-add", "1.0"}
configs["CudaVectorAdd2"] = Config{e2eRegistry, "cuda-vector-add", "2.0"}
configs["Dnsutils"] = Config{e2eRegistry, "dnsutils", "1.1"}
configs["EchoServer"] = Config{e2eRegistry, "echoserver", "2.2"}
configs["Etcd"] = Config{gcRegistry, "etcd", "3.4.3"}
configs["GlusterDynamicProvisioner"] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}
configs["Httpd"] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"}
configs["HttpdNew"] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}
configs["InvalidRegistryImage"] = Config{invalidRegistry, "alpine", "3.1"}
configs["IpcUtils"] = Config{e2eRegistry, "ipc-utils", "1.0"}
configs["JessieDnsutils"] = Config{e2eRegistry, "jessie-dnsutils", "1.0"}
configs["Kitten"] = Config{e2eRegistry, "kitten", "1.0"}
configs["Mounttest"] = Config{e2eRegistry, "mounttest", "1.0"}
configs["MounttestUser"] = Config{e2eRegistry, "mounttest-user", "1.0"}
configs["Nautilus"] = Config{e2eRegistry, "nautilus", "1.0"}
configs["NFSProvisioner"] = Config{quayIncubator, "nfs-provisioner", "v2.2.2"}
configs["Nginx"] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"}
configs["NginxNew"] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"}
configs["Nonewprivs"] = Config{e2eRegistry, "nonewprivs", "1.0"}
configs["NonRoot"] = Config{e2eRegistry, "nonroot", "1.0"}
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
configs["Pause"] = Config{gcRegistry, "pause", "3.1"}
configs["Perl"] = Config{dockerLibraryRegistry, "perl", "5.26"}
configs["PrometheusDummyExporter"] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs["PrometheusToSd"] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"}
configs["Redis"] = Config{dockerLibraryRegistry, "redis", "5.0.5-alpine"}
configs["RegressionIssue74839"] = Config{e2eRegistry, "regression-issue-74839-amd64", "1.0"}
configs["ResourceConsumer"] = Config{e2eRegistry, "resource-consumer", "1.5"}
configs["ResourceController"] = Config{e2eRegistry, "resource-consumer-controller", "1.0"}
configs["SdDummyExporter"] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}
configs["StartupScript"] = Config{googleContainerRegistry, "startup-script", "v1"}
configs["TestWebserver"] = Config{e2eRegistry, "test-webserver", "1.0"}
configs["VolumeNFSServer"] = Config{e2eRegistry, "volume/nfs", "1.0"}
configs["VolumeISCSIServer"] = Config{e2eRegistry, "volume/iscsi", "2.0"}
configs["VolumeGlusterServer"] = Config{e2eRegistry, "volume/gluster", "1.0"}
configs["VolumeRBDServer"] = Config{e2eRegistry, "volume/rbd", "1.0.1"}
return configs
}
9 changes: 8 additions & 1 deletion site/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ defaults:
version: master
gh: https://github.com/vmware-tanzu/sonobuoy/tree/master
layout: "docs"
- scope:
path: docs/v0.17.0
values:
version: v0.17.0
gh: https://github.com/vmware-tanzu/sonobuoy/tree/v0.17.0
layout: "docs"
- scope:
path: docs/v0.16.5
values:
Expand Down Expand Up @@ -160,9 +166,10 @@ collections:
- casestudies

versioning: true
latest: v0.16.5
latest: v0.17.0
versions:
- master
- v0.17.0
- v0.16.5
- v0.16.4
- v0.16.3
Expand Down
1 change: 1 addition & 0 deletions site/_data/toc-mapping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# Below is a commented out example of what this may look like:

master: master-toc
v0.17.0: v0-17-0toc
v0.16.5: v0-16-5toc
v0.16.4: v0-16-4toc
v0.16.3: v0-16-3toc
Expand Down
32 changes: 32 additions & 0 deletions site/_data/v0-17-0toc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
toc:
- title: Basics
subfolderitems:
- page: Overview
url: /index.html
- page: Checking Results
url: /results
- title: Plugins
subfolderitems:
- page: Overview
url: /plugins
- page: E2E & Conformance
url: /e2eplugin
- page: Examples
url: /examples
github: true
- title: Advanced
subfolderitems:
- page: Detailed result contents
url: /snapshot
- page: Configuration Options
url: /sonobuoy-config
- page: Custom Registries & Airgap Testing
url: /airgap
- page: Using Private Images
url: /pullsecrets
- page: Advanced Customization
url: /gen
- title: Resources
subfolderitems:
- page: Frequently Asked Questions
url: /faq
Loading