Skip to content

Commit

Permalink
Merge pull request #381 from nds-org/release-1.3.2
Browse files Browse the repository at this point in the history
Release 1.3.2
  • Loading branch information
bodom0015 authored Jun 23, 2022
2 parents c72de95 + ab41255 commit c8ca446
Show file tree
Hide file tree
Showing 7 changed files with 1,173 additions and 3,796 deletions.
2 changes: 1 addition & 1 deletion apiserver/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BUILD_DATE=`date +%Y-%m-%d\ %H:%M`
VERSIONFILE="pkg/version/version.go"
VERSION="1.3.1"
VERSION="1.3.2"

set -e

Expand Down
9 changes: 6 additions & 3 deletions apiserver/pkg/kube/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ func (k *KubeHelper) CreateServiceTemplate(name string, stack string, spec *ndsa
return &k8svc
}

// Not currently used
// TODO: Retest with Traefik. Policies appear to be specific to NGINX
func (k *KubeHelper) CreateNetworkPolicy(ns string, name string, groupName string) (*networkingv1.NetworkPolicy, error) {
k8netPolicy := networkingv1.NetworkPolicy{
TypeMeta: metav1.TypeMeta{
Expand Down Expand Up @@ -912,7 +914,7 @@ func (k *KubeHelper) CreateIngress(pid string, domain string, service string, po

annotations := map[string]string{}

// TODO: Support configurable ingress class
// TODO: Support configurable ingress class? Applicable for cluster with multiple ingress controllers
// annotations["kubernetes.io/ingress.class"] = "nginx"

if clusterIssuer != "" {
Expand All @@ -923,8 +925,9 @@ func (k *KubeHelper) CreateIngress(pid string, domain string, service string, po
annotations["cert-manager.io/issuer"] = issuer
}
if enableAuth {
annotations["nginx.ingress.kubernetes.io/auth-signin"] = k.authSignInURL
annotations["nginx.ingress.kubernetes.io/auth-url"] = k.authURL
annotations["ingress.kubernetes.io/auth-signin"] = k.authSignInURL
annotations["ingress.kubernetes.io/auth-url"] = k.authURL
annotations["ingress.kubernetes.io/auth-type"] = "forward"
} else {
glog.V(4).Info("Removing auth annotations for " + ingress.Name)
}
Expand Down
2 changes: 1 addition & 1 deletion gui/ConfigModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ angular
/**
* The version/revision of this GUI
*/
.constant('BuildVersion', '1.3.1-devel')
.constant('BuildVersion', '1.3.2-devel')
.constant('BuildDate', '')

/**
Expand Down
2 changes: 1 addition & 1 deletion gui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM ndslabs/ng-base:focal-erbium

# Set build information here before building (or at build time with --build-args version=X.X.X)
ARG version="1.3.1"
ARG version="1.3.2"

# Set up necessary environment variables
ENV DEBIAN_FRONTEND="noninteractive" \
Expand Down
Loading

0 comments on commit c8ca446

Please sign in to comment.