Skip to content
This repository has been archived by the owner on Apr 14, 2024. It is now read-only.

Commit

Permalink
Release ubi8 v1.2.3 (#136)
Browse files Browse the repository at this point in the history
* Sync with osm 1.2.3

* Sync with osm 1.2.3

* Sync with osm 1.2.3

* Sync with osm 1.2.3
  • Loading branch information
cybwan authored Jan 13, 2023
1 parent 5373174 commit 72e804f
Show file tree
Hide file tree
Showing 43 changed files with 1,346 additions and 1,500 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.47.0
version: v1.48.0
skip-pkg-cache: true

codegen:
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
# matrix:
# k8s_version: [""]
# focus: [""]
# bucket: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
# bucket: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
# include:
# - k8s_version: v1.19.11
# focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
Expand All @@ -180,6 +180,9 @@ jobs:
# - k8s_version: v1.24.1
# focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
# bucket: ".*"
# - k8s_version: v1.25.1
# focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
# bucket: ".*"
# env:
# CTR_TAG: ${{ github.sha }}
# CTR_REGISTRY: "localhost:5000" # unused for kind, but currently required in framework
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-ubi8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
file: ./dockerfiles/Dockerfile.osm-edge-${{ matrix.id }}
platforms: linux/amd64,linux/arm64
build-args: |
GO_VERSION=1.17
GO_VERSION=1.18
LDFLAGS=-X ${{ env.BUILD_DATE_VAR }}=${{ env.BUILD_DATE }} -X ${{ env.BUILD_VERSION_VAR }}=${{ env.VERSION }} -X ${{ env.BUILD_GITCOMMIT_VAR }}=${{ env.GIT_SHA }} -s -w
push: ${{ (github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == format('refs/heads/{0}', github.event.repository.default_branch) )) }}
tags: ${{ steps.docker_meta.outputs.tags }}
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
file: ./dockerfiles/Dockerfile.demo
platforms: linux/amd64,linux/arm64
build-args: |
GO_VERSION=1.17
GO_VERSION=1.18
BINARY=${{ matrix.id }}
push: ${{ (github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == format('refs/heads/{0}', github.event.repository.default_branch) )) }}
tags: ${{ steps.docker_meta.outputs.tags }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#build stage
FROM golang:1.17-alpine AS builder
FROM golang:1.18-alpine AS builder

RUN apk update
RUN apk add --no-cache make
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GIT_SHA=$$(git rev-parse HEAD)
BUILD_DATE_VAR := github.com/openservicemesh/osm/pkg/version.BuildDate
BUILD_VERSION_VAR := github.com/openservicemesh/osm/pkg/version.Version
BUILD_GITCOMMIT_VAR := github.com/openservicemesh/osm/pkg/version.GitCommit
DOCKER_GO_VERSION = 1.17
DOCKER_GO_VERSION = 1.18
DOCKER_BUILDX_PLATFORM ?= linux/amd64
# Value for the --output flag on docker buildx build.
# https://docs.docker.com/engine/reference/commandline/buildx_build/#output
Expand Down
4 changes: 2 additions & 2 deletions charts/osm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 1.2.2-ubi8
version: 1.2.3-ubi8

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v1.2.2
appVersion: v1.2.3

# This specifies the minimum Kubernetes version OSM is compatible with.
kubeVersion: ">= 1.19.0-0"
Expand Down
4 changes: 2 additions & 2 deletions charts/osm/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Open Service Mesh Edge Helm Chart

![Version: 1.2.2-ubi8](https://img.shields.io/badge/Version-1.2.2--ubi8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.2.2](https://img.shields.io/badge/AppVersion-v1.2.2-informational?style=flat-square)
![Version: 1.2.3-ubi8](https://img.shields.io/badge/Version-1.2.3--ubi8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.2.3](https://img.shields.io/badge/AppVersion-v1.2.3-informational?style=flat-square)

A Helm chart to install the [osm-edge](https://github.com/flomesh-io/osm-edge) control plane on Kubernetes.

Expand Down Expand Up @@ -119,7 +119,7 @@ The following table lists the configurable parameters of the osm chart and their
| osm.image.name.osmSidecarInit | string | `"osm-edge-sidecar-init-ubi8"` | Sidecar init container's image name |
| osm.image.pullPolicy | string | `"IfNotPresent"` | Container image pull policy for control plane containers |
| osm.image.registry | string | `"quay.io/flomesh"` | Container image registry for control plane images |
| osm.image.tag | string | `"1.2.2"` | Container image tag for control plane images |
| osm.image.tag | string | `"1.2.3"` | Container image tag for control plane images |
| osm.imagePullSecrets | list | `[]` | `osm-controller` image pull secret |
| osm.inboundPortExclusionList | list | `[]` | Specifies a global list of ports to exclude from inbound traffic interception by the sidecar proxy. If specified, must be a list of positive integers. |
| osm.injector.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"kubernetes.io/os"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/osm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ osm:
# -- Container image pull policy for control plane containers
pullPolicy: IfNotPresent
# -- Container image tag for control plane images
tag: "1.2.2"
tag: "1.2.3"
# -- Image name defaults
name:
# -- osm-controller's image name
Expand Down
2 changes: 1 addition & 1 deletion codegen/gen-crd-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ROOT_PACKAGE="github.com/openservicemesh/osm"
ROOT_DIR="$(git rev-parse --show-toplevel)"

# get code-generator version from go.sum
CODEGEN_VERSION="v0.23.5" # Must match k8s.io/client-go version defined in go.mod
CODEGEN_VERSION="v0.26.0" # Must match k8s.io/client-go version defined in go.mod
CODEGEN_PKG="$(echo `go env GOPATH`/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION})"

echo ">>> using codegen: ${CODEGEN_PKG}"
Expand Down
2 changes: 1 addition & 1 deletion demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## System Requirements
- MacOS, Linux or WSL2 on Windows
- GCC
- Go version [1.17.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
- Go version [1.18.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
- Kubectl version 1.15 or higher
- Docker CLI
- on a Debian based GNU/Linux system: `sudo apt-get install docker`
Expand Down
2 changes: 1 addition & 1 deletion demo/deploy-cert-manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ return $?
}

# shellcheck disable=SC2086
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml

kubectl rollout status deploy -n cert-manager cert-manager
kubectl rollout status deploy -n cert-manager cert-manager-cainjector
Expand Down
2 changes: 1 addition & 1 deletion docs/development_guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ OSM leverages [Envoy proxy](https://github.com/envoyproxy/envoy) as a data plane

## Get Go-ing

This Open Service Mesh project uses [Go v1.17.0+](https://golang.org/). If you are not familiar with Go, spend some time with the excellent [Tour of Go](https://tour.golang.org/).
This Open Service Mesh project uses [Go v1.18.0+](https://golang.org/). If you are not familiar with Go, spend some time with the excellent [Tour of Go](https://tour.golang.org/).

## Get the dependencies

Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
# Release Notes
## Release v1.2.3

### Notable changes
- Allow non-statefulset headless services to be accessed
- Bump cert-manager version to v1.10

## Release v1.2.2

### Notable changes
- Certificate rotation now ignores monotonic clock readings when checking expiration
- Add keep-alive time to detect sidecar disconnections

## Release v1.2.1

Expand Down
Loading

0 comments on commit 72e804f

Please sign in to comment.