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.

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

Kubernetes 1.10 #258

Merged
merged 17 commits into from
May 7, 2018
Merged

Kubernetes 1.10 #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
362fa41
ci: Update Kubernetes to v1.10.0
asymmetric Apr 11, 2018
c510c9d
ci: Update minikube to 0.26.1
asymmetric Apr 11, 2018
58c9779
ci: Force minikube to use localkube
asymmetric Apr 11, 2018
d8c046d
ci: Update code-gen to kubernetes-10.0.0
Apr 24, 2018
a4472eb
dep: Update dependencies
Apr 24, 2018
ef4d39c
code-gen: Run code-gen script
Apr 24, 2018
ca99954
controller/v1beta2: Get StatefulSet from v1beta2
asymmetric Apr 9, 2018
1238c57
controller/v1beta2: Remove UpdateStrategy
asymmetric Apr 11, 2018
1966a3f
e2e/v1beta1: Get StatefulSets from v1beta2
Apr 25, 2018
0c17e1e
README: Drop support for 1.7
asymmetric Apr 16, 2018
8afd086
README: Add requirement on kubectl
Apr 25, 2018
328377e
controller/v1beta2: Use native Kubernetes funcs
Apr 24, 2018
b16c8fd
code-gen: Remove warning from boilerplate
Apr 24, 2018
a41d3b0
ci: Disable printing minikube logs
Apr 24, 2018
1a0b630
controller/v1beta2: Label StatefulSets
Apr 24, 2018
9531d16
ci: Fix typos
Apr 30, 2018
ecb3953
code-gen: Update instructions
May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 11 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ jobs:
- run:
name: setup
environment:
K8S_VERSION: v1.9.0
MINIKUBE_VERSION: v0.25.2
K8S_VERSION: v1.10.0
MINIKUBE_VERSION: v0.26.1
CHANGE_MINIKUBE_NONE_USER: true
command: |
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
sudo minikube config set WantReportErrorPrompt false
sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
# TODO: remove the --bootstrapper flag once this issue is solved: https://github.com/kubernetes/minikube/issues/2704
sudo -E minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
- run:
name: code-gen script
environment:
CODEGEN_PKG: ../../../../src/k8s.io/code-generator
CODEGEN_VERSION: release-1.9
CODEGEN_VERSION: kubernetes-1.10.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be release-1.10?

Whatever outcome is (either a tag or a branch), we should keep docs in the update codegen script in sync.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The release- are branches, i.e. they get updated, so we cannot guarantee that it will always be the same commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What docs are you referring to?

Copy link
Contributor

Choose a reason for hiding this comment

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

These ones:

habitat-operator/hack/update-codegen.sh

Lines 20 to 28 in 3adc004

# First of all, the code-generator needs to be fetched:
# $ go get -u k8s.io/code-generator
#
# Now checkout the appropriate branch for the Kubernetes version that
# you're building for. For example if you're building for Kubernetes
# 1.10.0 you would checkout the `release-1.10` branch.
#
# Then run this from the repo's root with:
# $ CODEGEN_PKG=../../../k8s.io/code-generator hack/update-codegen.sh

GOPATH: /home/circleci/.go_workspace
command: |
mkdir -p $CODEGEN_PKG
Expand All @@ -46,7 +47,9 @@ jobs:
name: print habitat object logs
command: kubectl logs -lhabitat-operator=true --tail=100
when: on_fail
- run:
name: print minikube logs
command: minikube logs
when: on_fail
# NOTE: this relies on journalctl, which is not present on the version of
Copy link
Contributor

Choose a reason for hiding this comment

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

So how did it work before? Old minikube/k8s didn't require journalctl?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Old minikube didn't use journalctl.

# Ubuntu currently run by CircleCI
# - run:
# - name: print minikube logs
# - command: minikube logs
# - when: on_fail
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ go_import_path: github.com/habitat-sh/habitat-operator
env:
global:
- CHANGE_MINIKUBE_NONE_USER=true
- K8S_VERSION=v1.9.0
- MINIKUBE_VERSION=v0.25.2
- CODEGEN_VERSION=release-1.9
- K8S_VERSION=v1.10.0
- MINIKUBE_VERSION=v0.26.1
- CODEGEN_VERSION=kubernetes-1.10.0
Copy link
Contributor

Choose a reason for hiding this comment

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

release-1.10?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above


# Skip installation of dependencies since they are already in vendor.
install: true
Expand All @@ -27,7 +27,8 @@ before_script:
# Download minikube.
- curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
- sudo minikube config set WantReportErrorPrompt false
- sudo minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
# TODO: remove the --bootstrapper flag once this issue is solved: https://github.com/kubernetes/minikube/issues/2704
- sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
# Fix the kubectl context, as it's often stale.
- minikube update-context
# Clone the code generator repo
Expand Down
127 changes: 21 additions & 106 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@

[[constraint]]
name = "k8s.io/client-go"
version = "v6.0.0"
version = "v7.0.0"

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.9.0"
version = "kubernetes-1.10.0"

[[constraint]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.9.0"
version = "kubernetes-1.10.0"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.9.0"
version = "kubernetes-1.10.0"
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ For a more detailed description of the Habitat type have a look [here](https://g
## Prerequisites

- Habitat `>= 0.52.0`
- Kubernetes cluster with version `1.7.x`, `1.8.x` or `1.9.x`.
- Kubernetes cluster with version `1.8.x`, `1.9.x` or `1.10.x`
- Kubectl version `1.9.x` or `1.10.x`

## Installing

Expand Down
2 changes: 0 additions & 2 deletions hack/boilerplate.go.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// This file was automatically generated, DO NOT EDIT.

4 changes: 2 additions & 2 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# First of all, the code-generator needs to be fetched:
# $ go get -u k8s.io/code-generator
#
# Now checkout the appropriate branch for the Kubernetes version that
# Now checkout the appropriate tag for the Kubernetes version that
# you're building for. For example if you're building for Kubernetes
# 1.10.0 you would checkout the `release-1.10` branch.
# 1.10.0 you would checkout the `kubernetes-1.10.0` tag.
#
# Then run this from the repo's root with:
# $ CODEGEN_PKG=../../../k8s.io/code-generator hack/update-codegen.sh
Expand Down
10 changes: 3 additions & 7 deletions pkg/apis/habitat/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/versioned/clientset.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/versioned/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading