Skip to content

Commit 5a963a9

Browse files
committed
K8S-552 bump component version
1 parent ebf49ac commit 5a963a9

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

addons/haproxy/haproxy-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ spec:
146146
serviceAccountName: haproxy-ingress-service-account
147147
containers:
148148
- name: haproxy-ingress
149-
image: haproxytech/kubernetes-ingress:1.6.0
149+
image: haproxytech/kubernetes-ingress:1.6.1
150150
args:
151151
- --configmap=default/haproxy-configmap
152152
- --default-backend-service=haproxy-controller/ingress-default-backend

addons/upgrade.jps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ actions:
312312
upgrade-cplanes-cluster:
313313
- cmd[${this.id}]: |-
314314
while true; do echo "$(kubectl get nodes --no-headers 2>/dev/null)" | grep -qv '\sReady\s' || break; sleep 3; done
315+
/usr/local/sbin/k8sm-config -f
315316
# drop in k8s-1.21+
316317
if [ -f "/var/log/kubernetes/k8s-master-config.log" ] && [ ! -f "/var/log/kubernetes/k8s-cplane-config.log" ]; then
317318
/usr/bin/mv /var/log/kubernetes/k8s-master-config.log /var/log/kubernetes/k8s-cplane-config.log;
318319
fi
319320
rm -f /var/log/kubernetes/k8s-master-config.log
320-
/usr/local/sbin/k8sm-config -f
321321
kubeadm_package=kubeadm-$(echo '${this.version}' | cut -d 'v' -f2)-1.el7.x86_64
322322
yum update -y "https://app-artifacts.s3.eu-central-1.amazonaws.com/kubernetes/${kubeadm_package}.rpm"
323323
rpm -qi "${kubeadm_package}" || exit 1

configs/settings.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ fields:
1717
default: |-
1818
OPERATOR_NAMESPACE=open-liberty
1919
kubectl create namespace "$OPERATOR_NAMESPACE"
20-
kubectl apply -f https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.0/openliberty-app-crd.yaml
21-
curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.0/openliberty-app-cluster-rbac.yaml | sed -e "s/OPEN_LIBERTY_OPERATOR_NAMESPACE/${OPERATOR_NAMESPACE}/" | kubectl apply -f -
22-
curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.0/openliberty-app-operator.yaml | sed -e "s/OPEN_LIBERTY_WATCH_NAMESPACE/${OPERATOR_NAMESPACE}/" | kubectl apply -n ${OPERATOR_NAMESPACE} -f -
20+
kubectl apply -f https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-crd.yaml
21+
curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-cluster-rbac.yaml | sed -e "s/OPEN_LIBERTY_OPERATOR_NAMESPACE/${OPERATOR_NAMESPACE}/" | kubectl apply -f -
22+
curl -L https://raw.githubusercontent.com/OpenLiberty/open-liberty-operator/master/deploy/releases/0.7.1/openliberty-app-operator.yaml | sed -e "s/OPEN_LIBERTY_WATCH_NAMESPACE/${OPERATOR_NAMESPACE}/" | kubectl apply -n ${OPERATOR_NAMESPACE} -f -
2323
kubectl apply -f https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.20.6/addons/open-liberty.yaml
2424
2525
- name: label

scripts/cplane-postconfig.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# set -x
33

44
# components
5-
K9S="0.24.9"
5+
K9S="0.24.10"
66
POPEYE="0.9.1"
77
STERN="1.11.0"
88
KUBECTX="0.9.3"
@@ -11,7 +11,7 @@ KUBECTX="0.9.3"
1111

1212
# utilities
1313
echo "$(date): retrieving k8s utilities";
14-
[ -n "${K9S}" ] && { wget -O- "https://github.com/derailed/k9s/releases/download/v${K9S}/k9s_Linux_x86_64.tar.gz" | tar xz -C /usr/bin k9s; };
14+
[ -n "${K9S}" ] && { wget -O- "https://github.com/derailed/k9s/releases/download/v${K9S}/k9s_v${K9S}_Linux_x86_64.tar.gz" | tar xz -C /usr/bin k9s; };
1515
[ -n "${POPEYE}" ] && { wget -O- "https://github.com/derailed/popeye/releases/download/v${POPEYE}/popeye_Linux_x86_64.tar.gz" | tar xz -C /usr/bin popeye; };
1616
[ -n "${STERN}" ] && {
1717
wget -nv "https://github.com/wercker/stern/releases/download/${STERN}/stern_linux_amd64" -O /usr/bin/stern;

0 commit comments

Comments
 (0)