Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 6ecc61c

Browse files
authored
Merge pull request #5263 from keithmattix/release-v1.2
(backport/v1.2.3) Allow all headless services, not just those backed by Statefulsets with subdomains (#5250)
2 parents 6815b67 + 8ed34f8 commit 6ecc61c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1122
-1480
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: golangci-lint
5555
uses: golangci/golangci-lint-action@v3
5656
with:
57-
version: v1.47.0
57+
version: v1.48.0
5858
skip-pkg-cache: true
5959

6060
codegen:
@@ -160,7 +160,7 @@ jobs:
160160
matrix:
161161
k8s_version: [""]
162162
focus: [""]
163-
bucket: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
163+
bucket: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
164164
include:
165165
- k8s_version: v1.22.9
166166
focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"

CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ref: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
22

3-
* @shashankram @snehachhabria @nojnhuh @draychev @jaellio @trstringer @keithmattix @steeling
3+
* @shashankram @nojnhuh @jaellio @trstringer @keithmattix @steeling @shalier
44

55
# Emeritus maintainers
6-
# @michelleN @eduser25
6+
# @michelleN @eduser25 @snehachhabria @draychev

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
#build stage
3-
FROM golang:1.17-alpine AS builder
3+
FROM golang:1.19-alpine AS builder
44

55
RUN apk update
66
RUN apk add --no-cache make

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ GIT_SHA=$$(git rev-parse HEAD)
2121
BUILD_DATE_VAR := github.com/openservicemesh/osm/pkg/version.BuildDate
2222
BUILD_VERSION_VAR := github.com/openservicemesh/osm/pkg/version.Version
2323
BUILD_GITCOMMIT_VAR := github.com/openservicemesh/osm/pkg/version.GitCommit
24-
DOCKER_GO_VERSION = 1.17
25-
DOCKER_BUILDX_PLATFORM ?= linux/amd64
24+
DOCKER_GO_VERSION = 1.19
25+
DOCKER_BUILDX_PLATFORM ?= linux/$(shell go env GOARCH)
2626
# Value for the --output flag on docker buildx build.
2727
# https://docs.docker.com/engine/reference/commandline/buildx_build/#output
2828
DOCKER_BUILDX_OUTPUT ?= type=registry

OWNERS

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
# Code maintainers (borrowed from https://github.com/openservicemesh/osm/blob/main/CODEOWNERS)
22

33
- @shashankram
4-
- @snehachhabria
54
- @nojnhuh
6-
- @draychev
75
- @jaellio
86
- @trstringer
97
- @keithmattix
108
- @steeling
9+
- @shalier
1110

1211
# Non-code maintainers
1312
- @phillipgibson
1413

1514
# Emeritus maintainers
1615
- @michelleN
1716
- @eduser25
17+
- @snehachhabria
18+
- @draychev

cmd/cli/env.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
77
8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99
1010
Unless required by applicable law or agreed to in writing, software
1111
distributed under the License is distributed on an "AS IS" BASIS,
1212
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
16-
Copyright 2020 The OSM contributors
16+
# Copyright 2020 The OSM contributors
1717
1818
Licensed under the MIT License
1919
Permission is hereby granted, free of charge, to any person obtaining a copy

cmd/cli/install.go

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const (
5757

5858
// chartTGZSource is the `helm package`d representation of the default Helm chart.
5959
// Its value is embedded at build time.
60+
//
6061
//go:embed chart.tgz
6162
var chartTGZSource []byte
6263

cmd/osm-bootstrap/osm-bootstrap.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,9 @@ func (b *bootstrap) ensureMeshConfig() error {
330330
}
331331

332332
// initiatilizeKubernetesEventsRecorder initializes the generic Kubernetes event recorder and associates it with
333+
//
333334
// the osm-bootstrap pod resource. The events recorder allows the osm-bootstap to publish Kubernets events to
334-
// report fatal errors with initializing this application. These events will show up in the output of `kubectl get events`
335+
// report fatal errors with initializing this application. These events will show up in the output of `kubectl get events`
335336
func (b *bootstrap) initiatilizeKubernetesEventsRecorder() error {
336337
bootstrapPod, err := b.getBootstrapPod()
337338
if err != nil {

codegen/gen-crd-client.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ROOT_PACKAGE="github.com/openservicemesh/osm"
3838
ROOT_DIR="$(git rev-parse --show-toplevel)"
3939

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

4444
echo ">>> using codegen: ${CODEGEN_PKG}"

demo/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## System Requirements
44
- MacOS, Linux or WSL2 on Windows
55
- GCC
6-
- Go version [1.17.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
6+
- Go version [1.19.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
77
- Kubectl version 1.15 or higher
88
- Docker CLI
99
- on a Debian based GNU/Linux system: `sudo apt-get install docker`

demo/deploy-cert-manager.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ return $?
4444
}
4545

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

4949
kubectl rollout status deploy -n cert-manager cert-manager
5050
kubectl rollout status deploy -n cert-manager cert-manager-cainjector

docs/development_guide/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ OSM leverages [Envoy proxy](https://github.com/envoyproxy/envoy) as a data plane
6363

6464
## Get Go-ing
6565

66-
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/).
66+
This Open Service Mesh project uses [Go v1.19.0+](https://golang.org/). If you are not familiar with Go, spend some time with the excellent [Tour of Go](https://tour.golang.org/).
6767

6868
## Get the dependencies
6969

0 commit comments

Comments
 (0)