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

update to Kubernetes 1.16 #60

Merged
merged 1 commit into from
Oct 9, 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 kubernetes/.openapi-generator/COMMIT
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requested Commit: c9737cf97d5e31936639842d389118e980ee85a9
Actual Commit: c9737cf97d5e31936639842d389118e980ee85a9
Requested Commit: a979fd8e13c86431831b0c769ba7b484e744afa5
Actual Commit: a979fd8e13c86431831b0c769ba7b484e744afa5
2 changes: 1 addition & 1 deletion kubernetes/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0-SNAPSHOT
4.2.0-SNAPSHOT
2 changes: 1 addition & 1 deletion kubernetes/.openapi-generator/swagger.json.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
284acb5a4085e4d8f76178e5f0057cf9f5db2b3b6c244d34f49b7f1d8b7c9fae
7343a558c44ee5251d1465500e55fbc88db17c0462e5c29dc0cb7f64f5848a07
16 changes: 11 additions & 5 deletions kubernetes/git_push.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
#
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"

git_user_id=$1
git_repo_id=$2
release_note=$3
git_host=$4

if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi

if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID"
Expand All @@ -28,7 +34,7 @@ git init
# Adds the files in the local repository and stages them for commit.
git add .

# Commits the tracked changes and prepares them to be pushed to a remote repository.
# Commits the tracked changes and prepares them to be pushed to a remote repository.
git commit -m "$release_note"

# Sets the new remote
Expand All @@ -37,16 +43,16 @@ if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi

fi

git pull origin master

# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

13 changes: 8 additions & 5 deletions kubernetes/kubernetes-client-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ description: .
.
base path: http://localhost
.
Kubernetes API version: v1.14.2
Kubernetes API version: v1.16.2
.
OpenAPI version: 3.0.1
.
category: Web
homepage: https://github.com/kubernetes-client/haskell
author: Auto Generated
maintainer: Shimin Guo <smguo2001@gmail.com>,
Akshay Mankar <itsakshaymankar@gmail.com>
maintainer: Shimin Guo <smguo2001@gmail.com>, Akshay Mankar <itsakshaymankar@gmail.com>
license: Apache-2.0
license-file: LICENSE
build-type: Simple
Expand Down Expand Up @@ -45,9 +44,9 @@ library
, deepseq >= 1.4 && <1.6
, exceptions >= 0.4
, http-api-data >= 0.3.4 && <0.5
, http-client >=0.5 && <0.6
, http-client >=0.5 && <0.7
, http-client-tls
, http-media >= 0.4 && < 0.8
, http-media >= 0.4 && < 0.9
, http-types >=0.8 && <0.13
, iso8601-time >=0.1.3 && <0.2.0
, microlens >= 0.4.3 && <0.5
Expand All @@ -66,8 +65,10 @@ library
exposed-modules:
Kubernetes.OpenAPI
Kubernetes.OpenAPI.API.Admissionregistration
Kubernetes.OpenAPI.API.AdmissionregistrationV1
Kubernetes.OpenAPI.API.AdmissionregistrationV1beta1
Kubernetes.OpenAPI.API.Apiextensions
Kubernetes.OpenAPI.API.ApiextensionsV1
Kubernetes.OpenAPI.API.ApiextensionsV1beta1
Kubernetes.OpenAPI.API.Apiregistration
Kubernetes.OpenAPI.API.ApiregistrationV1
Expand Down Expand Up @@ -101,6 +102,8 @@ library
Kubernetes.OpenAPI.API.Core
Kubernetes.OpenAPI.API.CoreV1
Kubernetes.OpenAPI.API.CustomObjects
Kubernetes.OpenAPI.API.Discovery
Kubernetes.OpenAPI.API.DiscoveryV1alpha1
Kubernetes.OpenAPI.API.Events
Kubernetes.OpenAPI.API.EventsV1beta1
Kubernetes.OpenAPI.API.Extensions
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/lib/Kubernetes/OpenAPI.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)

OpenAPI Version: 3.0.1
Kubernetes API version: v1.14.2
Kubernetes API version: v1.16.2
Generated by OpenAPI Generator (https://openapi-generator.tech)
-}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)

OpenAPI Version: 3.0.1
Kubernetes API version: v1.14.2
Kubernetes API version: v1.16.2
Generated by OpenAPI Generator (https://openapi-generator.tech)
-}

Expand Down
Loading