Skip to content

removed generator flag as it is deprecated in recent version of kubectl 1.21+ #5295

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

Merged
merged 5 commits into from
Oct 12, 2021
Merged

removed generator flag as it is deprecated in recent version of kubectl 1.21+ #5295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
416198c
removed generator flag as it is deprecated in recent version of kubectl
laxmikantbpandhare Oct 8, 2021
0062c08
modified ENVTEST_K8S_VERSION from Makefile
laxmikantbpandhare Oct 8, 2021
0e0a3d9
modified ENVTEST_K8S_VERSIONto 1.22.1 from Makefile
laxmikantbpandhare Oct 8, 2021
eb5ee4f
modifed version of ENVTEST_K8S_VERSION, the newer version 1.22 deprec…
laxmikantbpandhare Oct 11, 2021
4520335
removed comments
laxmikantbpandhare Oct 11, 2021
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export GIT_VERSION = $(shell git describe --dirty --tags --always)
export GIT_COMMIT = $(shell git rev-parse HEAD)
export K8S_VERSION = 1.21
# TODO: bump this to 1.21, after kubectl `--generator` flag is removed from e2e tests.
export ENVTEST_K8S_VERSION = 1.20.2
export ENVTEST_K8S_VERSION = 1.21.1

# Build settings
export TOOLS_DIR = tools/bin
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/ansible/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,8 @@ var _ = Describe("Running ansible projects", func() {
Expect(len(token)).To(BeNumerically(">", 0))

By("creating a curl pod")
// TODO: the flag --generator=run-pod/v1 is deprecated, however, shows that besides
// it should not make any difference and work locally successfully when the flag is removed
// the test will fail and the curl pod is not found when the flag is not used
cmdOpts := []string{
"run", "--generator=run-pod/v1", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"run", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"--serviceaccount", tc.Kubectl.ServiceAccount, "--",
"curl", "-v", "-k", "-H", fmt.Sprintf(`Authorization: Bearer %s`, token),
fmt.Sprintf("https://%s-controller-manager-metrics-service.%s.svc:8443/metrics", tc.ProjectName, tc.Kubectl.Namespace),
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/go/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,8 @@ var _ = Describe("operator-sdk", func() {
Expect(len(token)).To(BeNumerically(">", 0))

By("creating a curl pod")
// TODO: the flag --generator=run-pod/v1 is deprecated, however, shows that besides
// it should not make any difference and work locally successfully when the flag is removed
// the test will fail and the curl pod is not found when the flag is not used
cmdOpts := []string{
"run", "--generator=run-pod/v1", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"run", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"--serviceaccount", tc.Kubectl.ServiceAccount, "--",
"curl", "-v", "-k", "-H", fmt.Sprintf(`Authorization: Bearer %s`, token),
fmt.Sprintf("https://%s-controller-manager-metrics-service.%s.svc:8443/metrics", tc.ProjectName, tc.Kubectl.Namespace),
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/helm/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,8 @@ var _ = Describe("Running Helm projects", func() {
Expect(len(token)).To(BeNumerically(">", 0))

By("creating a curl pod")
// TODO: the flag --generator=run-pod/v1 is deprecated, however, shows that besides
// it should not make any difference and work locally successfully when the flag is removed
// the test will fail and the curl pod is not found when the flag is not used
cmdOpts := []string{
"run", "--generator=run-pod/v1", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"run", "curl", "--image=curlimages/curl:7.68.0", "--restart=OnFailure",
"--serviceaccount", tc.Kubectl.ServiceAccount, "--",
"curl", "-v", "-k", "-H", fmt.Sprintf(`Authorization: Bearer %s`, token),
fmt.Sprintf("https://%s-controller-manager-metrics-service.%s.svc:8443/metrics", tc.ProjectName, tc.Kubectl.Namespace),
Expand Down