Skip to content

remove scc type carries #14701

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Jun 26, 2017
Merged

remove scc type carries #14701

merged 9 commits into from
Jun 26, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jun 16, 2017

I'm getting weird build errors

# github.com/openshift/origin//vendor/github.com/mailru/easyjson/jwriter
vendor/github.com/mailru/easyjson/jwriter/writer.go:10: non-canonical import path "github.com/openshift/origin//vendor/github.com/mailru/easyjson/buffer" (should be "github.com/openshift/origin/vendor/github.com/mailru/easyjson/buffer")
vendor/github.com/mailru/easyjson/jwriter/writer.go:10: can't find import: "github.com/openshift/origin//vendor/github.com/mailru/easyjson/buffer"

trying to sort it out.

@liggitt liggitt added this to the 3.6.0 milestone Jun 16, 2017
php-coder
php-coder reviewed Jun 16, 2017
View reviewed changes
vendor/k8s.io/kubernetes/pkg/registry/core/rest/scc_patch.go Outdated
"k8s.io/apiserver/pkg/registry/rest"
)

// LegacyStorageWrapper allows someone to mutate the storage. We use this to add SCCs.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/LegacyStorageWrapper/LegacyStorageMutatorFunc/

@deads2k deads2k force-pushed the api-08-scc-addhook branch from 7c42380 to 1490b0a Compare June 16, 2017 19:49
@deads2k deads2k changed the title [WIP] remove scc type carries remove scc type carries Jun 16, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Jun 16, 2017

[test]

@deads2k
Copy link
Contributor Author

deads2k commented Jun 16, 2017

conflicts! noooooooooo

@deads2k
Copy link
Contributor Author

deads2k commented Jun 16, 2017

[test]

@deads2k
Copy link
Contributor Author

deads2k commented Jun 16, 2017

weird, the pull doesn't match https://github.com/deads2k/origin/commits/api-08-scc-addhook

@deads2k deads2k force-pushed the api-08-scc-addhook branch from 1490b0a to 56cd3d3 Compare June 16, 2017 20:39
@deads2k
Copy link
Contributor Author

deads2k commented Jun 16, 2017

so much for my test :(

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 16, 2017
@pweil-
Copy link

pweil- commented Jun 19, 2017

@mfojtik fyi

liggitt
liggitt reviewed Jun 20, 2017
View reviewed changes
pkg/security/api/types.go Outdated
FSPortworxVolume FSType = "portworxVolume"
FSScaleIO FSType = "scaleIO"
FSTypeAll FSType = "*"
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pick in the FSTypeNone bits here

liggitt
liggitt reviewed Jun 20, 2017
View reviewed changes
pkg/security/api/v1/defaults.go Outdated
// In order to support old clients the boolean fields will always take precedence.
defaultAllowedVolumes := fsTypeToStringSet(scc.Volumes)

// assume a nil volume slice is allowing everything for backwards compatibility
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FSTypeNone changes here

liggitt
liggitt reviewed Jun 20, 2017
View reviewed changes
pkg/security/registry/securitycontextconstraints/BUILD Outdated
@@ -0,0 +1,49 @@
package(default_visibility = ["//visibility:public"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove BUILD files from the origin packages

liggitt
liggitt reviewed Jun 20, 2017
View reviewed changes
pkg/security/registry/securitycontextconstraints/doc.go Outdated
@@ -0,0 +1,19 @@
/*
Copyright 2015 The Kubernetes Authors.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scc files we were carrying should never have had kube copyrights... remove them when moving into origin packages

liggitt
liggitt reviewed Jun 20, 2017
View reviewed changes
pkg/security/scc/byrestrictions.go Outdated
case kapi.FSTypeSecret, kapi.FSTypeConfigMap,
kapi.FSTypeEmptyDir, kapi.FSTypeDownwardAPI:
case securityapi.FSTypeSecret, securityapi.FSTypeConfigMap,
securityapi.FSTypeEmptyDir, securityapi.FSTypeDownwardAPI:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FSTypeNone

@deads2k
Copy link
Contributor Author

deads2k commented Jun 21, 2017

FSTypeNone

You merged after this was posted. How is the structure and after I rebase you can come back through and make sure it was all pickdown down properly.

@liggitt
Copy link
Contributor

liggitt commented Jun 21, 2017

structure seemed fine, nits overall

@deads2k deads2k force-pushed the api-08-scc-addhook branch from 56cd3d3 to 91fbf83 Compare June 22, 2017 18:03
@deads2k deads2k removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2017
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2017
@deads2k deads2k force-pushed the api-08-scc-addhook branch from 91fbf83 to 6ce395f Compare June 22, 2017 19:59
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Jun 22, 2017 

hack/update-generated-swagger-descriptions.sh
# github.com/openshift/origin/test/extended/util
test/extended/util/test.go:404: c.CoreV1().SecurityContextConstraints undefined (type "github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1".CoreV1Interface has no field or method SecurityContextConstraints)
test/extended/util/test.go:417: c.CoreV1().SecurityContextConstraints undefined (type "github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1".CoreV1Interface has no field or method SecurityContextConstraints)
Generating fresh completions...
and protobuf.   I hate protobuf

@deads2k deads2k force-pushed the api-08-scc-addhook branch from 6ce395f to e54c831 Compare June 23, 2017 12:03
@deads2k deads2k mentioned this pull request Jun 23, 2017
Merged
@deads2k deads2k force-pushed the api-08-scc-addhook branch 2 times, most recently from e7834cf to 6c4fb50 Compare June 23, 2017 15:19
@deads2k
Copy link
Contributor Author

deads2k commented Jun 23, 2017

I'd like this one before #14843

@deads2k deads2k mentioned this pull request Jun 23, 2017
Merged
@deads2k
Copy link
Contributor Author

deads2k commented Jun 23, 2017

@stevekuznetsov is there some serial option I can run to see my test-go results? Locally my machine can't seem to start a built. It constantly fails (even on master).

@stevekuznetsov
Copy link
Contributor

@deads2k we should have scripts/test-go/logs/test-go{,-err}.log but they don't seem to be present in S3 artifacts -- lucky you.

Locally my machine can't seem to start a build. It constantly fails (even on master).

Can you:

hack/env hack/test-go.sh

?

@deads2k deads2k force-pushed the api-08-scc-addhook branch 2 times, most recently from 51d07e5 to c767366 Compare June 26, 2017 12:55
@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

re[test]

1 similar comment
@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

re[test]

@deads2k deads2k force-pushed the api-08-scc-addhook branch from c767366 to 85b8f6e Compare June 26, 2017 14:45
@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

re[test]

@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

#14043 re[test]

@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

re[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 85b8f6e

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2610/) (Base Commit: 0d15b16) (PR Branch Commit: 85b8f6e)

@deads2k deads2k merged commit 85b8f6e into openshift:master Jun 26, 2017
@deads2k deads2k deleted the api-08-scc-addhook branch August 3, 2017 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@php-coder php-coder php-coder left review comments

@liggitt liggitt liggitt left review comments

Assignees

@php-coder php-coder

Labels
None yet
Projects
None yet
Milestone
3.6.0
Development

Successfully merging this pull request may close these issues.
6 participants
@deads2k @pweil- @liggitt @stevekuznetsov @openshift-bot @php-coder