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 helm to 2.16.2 and general version refresh #208

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ You are encouraged to take a look!

The microBean Helm project's version number tracks the Helm and Tiller
release it works with, together with its own version semantics. For
example, a microBean Helm version of `2.12.3.0.0.1` means that the Helm
version it tracks is `2.12.3` and the (SemVer-compatible) version of
example, a microBean Helm version of `2.16.2.0.0.1` means that the Helm
version it tracks is `2.16.2` and the (SemVer-compatible) version of
the non-generated code that is part of _this_ project is `0.0.1`.

# Installation
Expand All @@ -38,7 +38,7 @@ like this:
<groupId>org.microbean</groupId>
<artifactId>microbean-helm</artifactId>
<!-- See http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.microbean%22%20AND%20a%3A%22microbean-helm%22 for available releases. -->
<version>2.12.3.0.0.1</version>
<version>2.16.2.0.0.1</version>
<type>jar</type>
</dependency>

Expand Down
28 changes: 14 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.microbean</groupId>
<artifactId>microbean-helm</artifactId>
<version>2.12.3.0.0.1-SNAPSHOT</version>
<version>2.16.2.0.0.1-SNAPSHOT</version>

<parent>
<groupId>org.microbean</groupId>
Expand Down Expand Up @@ -58,50 +58,50 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.8.0</version>
<version>3.11.4</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.21.0</version>
<version>1.27.2</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.21.0</version>
<version>1.27.2</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
<version>1.21.0</version>
<version>1.27.2</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.21.0</version>
<version>1.27.2</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>4.3.0</version>
<version>4.8.0</version>
<type>jar</type>
</dependency>

<!-- See https://github.com/grpc/grpc-java/blob/master/SECURITY.md#openssl-statically-linked-netty-tcnative-boringssl-static -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.25.Final</version>
<version>2.0.29.Final</version>
<type>jar</type>
<classifier>${os.detected.classifier}</classifier>
</dependency>
Expand All @@ -116,7 +116,7 @@
<dependency>
<groupId>org.microbean</groupId>
<artifactId>microbean-development-annotations</artifactId>
<version>0.1.3</version>
<version>0.2.4</version>
<type>jar</type>
</dependency>

Expand All @@ -130,7 +130,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.24</version>
<version>1.26</version>
<type>jar</type>
</dependency>

Expand Down Expand Up @@ -334,7 +334,7 @@
<checkoutDirectory>${project.build.directory}/generated-sources/helm</checkoutDirectory>
<connectionUrl>scm:git:https://github.com/kubernetes/helm.git</connectionUrl>
<includes>_proto/hapi/**</includes>
<scmVersion>v2.12.3</scmVersion>
<scmVersion>v2.16.2</scmVersion>
<scmVersionType>tag</scmVersionType>
</configuration>
</execution>
Expand Down Expand Up @@ -382,10 +382,10 @@
</goals>
<configuration>
<checkStaleness>true</checkStaleness>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.21.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.2:exe:${os.detected.classifier}</pluginArtifact>
<pluginId>grpc-java</pluginId>
<protoSourceRoot>${project.build.directory}/generated-sources/helm/_proto</protoSourceRoot>
<protocArtifact>com.google.protobuf:protoc:3.8.0:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:3.11.4:exe:${os.detected.classifier}</protocArtifact>
</configuration>
</execution>
</executions>
Expand All @@ -398,7 +398,7 @@

<!-- maven-javadoc-plugin properties; see https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html -->
<doctitle>&lt;a href="${project.url}" target="_parent"&gt;&lt;span style="font-family:Lobster, cursive;"&gt;µb&lt;/span&gt; ${project.artifactId}&lt;/a&gt; ${project.version} &lt;a href="https://travis-ci.org/microbean/${project.artifactId}" target="_parent"&gt;&lt;img src="https://travis-ci.org/microbean/${project.artifactId}.svg?branch=master"&gt;&lt;/a&gt;</doctitle>
<links>https://www.grpc.io/grpc-java/javadoc/,https://developers.google.com/protocol-buffers/docs/reference/java/,https://google.github.io/guava/releases/19.0/api/docs/,https://microbean.github.io/microbean-kubernetes/apidocs/,https://microbean.github.io/microbean-development-annotations/apidocs/,http://static.javadoc.io/com.github.zafarkhaja/java-semver/0.9.0,https://static.javadoc.io/io.fabric8/kubernetes-client/4.3.0,https://static.javadoc.io/io.fabric8/kubernetes-model/4.3.0,https://static.javadoc.io/org.kamranzafar/jtar/2.3,https://static.javadoc.io/org.yaml/snakeyaml/1.24</links>
<links>https://www.grpc.io/grpc-java/javadoc/,https://developers.google.com/protocol-buffers/docs/reference/java/,https://google.github.io/guava/releases/19.0/api/docs/,https://microbean.github.io/microbean-kubernetes/apidocs/,https://microbean.github.io/microbean-development-annotations/apidocs/,http://static.javadoc.io/com.github.zafarkhaja/java-semver/0.9.0,https://static.javadoc.io/io.fabric8/kubernetes-client/4.8.0,https://static.javadoc.io/io.fabric8/kubernetes-model/4.8.0,https://static.javadoc.io/org.kamranzafar/jtar/2.3,https://static.javadoc.io/org.yaml/snakeyaml/1.26</links>
<stylesheetfile>css/stylesheet.css</stylesheetfile>

<!-- maven-scm-plugin properties; see http://maven.apache.org/components/scm/maven-scm-plugin/checkout-mojo.html -->
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/microbean/helm/Tiller.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public class Tiller implements ConfigAware<Config>, Closeable {
*
* <p>This field is never {@code null}.</p>
*/
public static final String VERSION = "2.12.3";
public static final String VERSION = "2.16.2";

/**
* The Kubernetes namespace into which Tiller server instances are
Expand Down Expand Up @@ -520,7 +520,7 @@ protected ManagedChannel buildChannel(final LocalPortForward portForward) {
.idleTimeout(5L, TimeUnit.SECONDS)
.keepAliveTime(30L, TimeUnit.SECONDS)
.maxInboundMessageSize(MAX_MESSAGE_SIZE)
.usePlaintext(true)
.usePlaintext()
.build();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/microbean/helm/TillerInstaller.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public class TillerInstaller {
/**
* The version of Tiller to install.
*/
public static final String VERSION = "2.12.3";
public static final String VERSION = "2.16.2";

/*
* Derivative static fields.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/microbean/helm/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @see org.microbean.helm.ReleaseManager
*/
@Version("2.12.3.0.0.1")
@Version("2.16.2.0.0.1")
package org.microbean.helm;

import org.microbean.development.annotation.Version;