Skip to content
Permalink
Browse files

Deprecate SelfLink fields

  • Loading branch information...
wojtek-t committed Jul 26, 2019
1 parent 1f6cb3c commit 8d56c8324d783f2172ff1acf35d4df340218010f
@@ -162,5 +162,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
WinDSR: {Default: false, PreRelease: featuregate.Alpha},
WatchBookmark: {Default: true, PreRelease: featuregate.Beta},
RequestManagement: {Default: false, PreRelease: featuregate.Alpha},
RemoveSelfLink: {Default: false, PreRelease: featuregate.Alpha},
// FIXME(wojtek-t): Change default to true before submitting.
// This is to see how many things will break.
RemoveSelfLink: {Default: true, PreRelease: featuregate.Alpha},
}
@@ -111,7 +111,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
framework.ExpectNoError(err, "failed to get pod templates in Table form in namespace: %s", ns)
framework.ExpectEqual(len(pagedTable.Rows), 2)
framework.ExpectNotEqual(pagedTable.ResourceVersion, "")
framework.ExpectNotEqual(pagedTable.SelfLink, "")
//framework.ExpectNotEqual(pagedTable.SelfLink, "")
framework.ExpectNotEqual(pagedTable.Continue, "")
framework.ExpectEqual(pagedTable.Rows[0].Cells[0], "template-0000")
framework.ExpectEqual(pagedTable.Rows[1].Cells[0], "template-0001")
@@ -138,7 +138,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
framework.ExpectEqual(len(table.Rows[0].Cells), len(table.ColumnDefinitions))
framework.ExpectEqual(table.ColumnDefinitions[0].Name, "Name")
framework.ExpectNotEqual(table.ResourceVersion, "")
framework.ExpectNotEqual(table.SelfLink, "")
//framework.ExpectNotEqual(table.SelfLink, "")

out := printTable(table)
gomega.Expect(out).To(gomega.MatchRegexp("^NAME\\s"))
@@ -443,7 +443,7 @@ func StartExternalProvisioner(c clientset.Interface, ns string, externalPluginNa
Containers: []v1.Container{
{
Name: "nfs-provisioner",
Image: "quay.io/kubernetes_incubator/nfs-provisioner:v2.2.0-k8s1.12",
Image: "gcr.io/groovy-sentry-504/nfs-provisioner:latest",
SecurityContext: &v1.SecurityContext{
Capabilities: &v1.Capabilities{
Add: []v1.Capability{"DAC_READ_SEARCH"},
@@ -30,7 +30,7 @@ spec:
serviceAccountName: csi-provisioner
containers:
- name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v0.4.1
image: gcr.io/groovy-sentry-504/csi-provisioner:v0-canary
args:
- "--provisioner=csi-hostpath-v0"
- "--csi-address=$(ADDRESS)"
@@ -37,6 +37,7 @@ type RegistryList struct {
PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"`
QuayK8sCSI string `yaml:"quayK8sCSI"`
WojtektTest string `yaml:"wojtekt"`
}

// Config holds an images registry, name, and version
@@ -73,6 +74,7 @@ func initReg() RegistryList {
PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples",
QuayK8sCSI: "quay.io/k8scsi",
WojtektTest: "gcr.io/groovy-sentry-504",
}
repoList := os.Getenv("KUBE_TEST_REPO_LIST")
if repoList == "" {
@@ -102,6 +104,7 @@ var (
googleContainerRegistry = registry.GoogleContainerRegistry
invalidRegistry = registry.InvalidRegistry
quayK8sCSI = registry.QuayK8sCSI
wojtekt = registry.WojtektTest
// PrivateRegistry is an image repository that requires authentication
PrivateRegistry = registry.PrivateRegistry
sampleRegistry = registry.SampleRegistry
@@ -298,6 +301,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
registryAndUser = dockerLibraryRegistry
case "quay.io/k8scsi":
registryAndUser = quayK8sCSI
case "gcr.io/groovy-sentry-504":
registryAndUser = wojtekt
default:
if countParts == 1 {
// We assume we found an image from docker hub library

0 comments on commit 8d56c83

Please sign in to comment.
You can’t perform that action at this time.