Skip to content

Commit

Permalink
Merge branch 'master' into k8s_1_27_member
Browse files Browse the repository at this point in the history
  • Loading branch information
ranakan19 authored Nov 11, 2024
2 parents dbb501e + acb22f9 commit 8fabc1a
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-operators-for-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Is executed only for comment events - in that case the pull_request field is empty
- name: Send Github API Request to get PR data
id: request
uses: octokit/request-action@v2.3.1
uses: octokit/request-action@v2.4.0
if: ${{ github.event.pull_request == '' }}
with:
route: ${{ github.event.issue.pull_request.url }}
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @sbryzak @mfrancisc
* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @mfrancisc
62 changes: 62 additions & 0 deletions config/crd/bases/toolchain.dev.openshift.com_nstemplatesets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,18 @@ spec:
status:
description: NSTemplateSetStatus defines the observed state of NSTemplateSet
properties:
clusterResources:
description: The cluster resources template (for cluster-wide quotas,
etc.) that was used last time to provision the NSTemplateSet CR
properties:
templateRef:
description: TemplateRef The name of the TierTemplate resource
which exists in the host cluster and which contains the template
to use
type: string
required:
- templateRef
type: object
conditions:
description: 'Conditions is an array of current NSTemplateSet conditions
Supported condition types: ConditionReady'
Expand Down Expand Up @@ -143,6 +155,31 @@ spec:
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
featureToggles:
description: FeatureToggles holds the list of feature toggles/flags
that were enabled when the NSTemplateSet CR was provisioned for
the last time
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaces:
description: The namespace templates that were used last time to provision
NSTemplateSet CR
items:
description: NSTemplateSetNamespace the namespace definition in
an NSTemplateSet resource
properties:
templateRef:
description: TemplateRef The name of the TierTemplate resource
which exists in the host cluster and which contains the template
to use
type: string
required:
- templateRef
type: object
type: array
x-kubernetes-list-type: atomic
provisionedNamespaces:
description: ProvisionedNamespaces is a list of Namespaces that were
provisioned by the NSTemplateSet.
Expand All @@ -160,6 +197,31 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
spaceRoles:
description: The SpaceRole template and the users to whom the template
was applied for when the NSTemplateSet CR was provisioned for the
last time
items:
description: NSTemplateSetSpaceRole the role template and the users
to whom the templates should be applied to
properties:
templateRef:
description: TemplateRef The name of the TierTemplate resource
which exists in the host cluster and which contains the template
to use
type: string
usernames:
description: Usernames the usernames to which the template applies
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- templateRef
- usernames
type: object
type: array
x-kubernetes-list-type: atomic
type: object
type: object
x-kubernetes-preserve-unknown-fields: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,9 @@ spec:
spec:
description: ToolchainClusterSpec defines the desired state of ToolchainCluster
properties:
apiEndpoint:
description: "The API endpoint of the member cluster. This can be
a hostname, hostname:port, IP or IP:port. \n Be aware that this
field is going to be replaced with the Status.APIEndpoint in the
future."
type: string
caBundle:
description: "CABundle contains the certificate authority information.
\n Note that this is going to be deprecated and removed. It will
be replaced by a field in the kubecondig of the connection secret"
type: string
disabledTLSValidations:
description: "DisabledTLSValidations defines a list of checks to ignore
when validating the TLS connection to the member cluster. This
can be any of *, SubjectName, or ValidityPeriod. If * is specified,
it is expected to be the only option in list. \n Note that this
is going to be deprecated and removed. It will be replaced by the
kubeconfig stored in the connection secret."
items:
type: string
type: array
x-kubernetes-list-type: set
secretRef:
description: "Name of the secret containing the token required to
access the member cluster. The secret needs to exist in the same
namespace as the control plane and should have a \"token\" key.
\n In the near future, the secret will contain the whole kubeconfig
required to connect to the cluster."
description: Name of the secret containing the kubeconfig required
to connect to the cluster.
properties:
name:
description: Name of a secret within the enclosing namespace
Expand All @@ -79,7 +54,6 @@ spec:
- name
type: object
required:
- apiEndpoint
- secretRef
type: object
status:
Expand Down
4 changes: 4 additions & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Namespace
metadata:
labels:
control-plane: controller-manager
kubesaw-control-plane: kubesaw-controller-manager
name: system
---
apiVersion: apps/v1
Expand All @@ -12,17 +13,20 @@ metadata:
namespace: system
labels:
control-plane: controller-manager
kubesaw-control-plane: kubesaw-controller-manager
annotations:
kubectl.kubernetes.io/default-container: manager
spec:
selector:
matchLabels:
control-plane: controller-manager
kubesaw-control-plane: kubesaw-controller-manager
replicas: 1
template:
metadata:
labels:
control-plane: controller-manager
kubesaw-control-plane: kubesaw-controller-manager
spec:
securityContext:
runAsNonRoot: true
Expand Down
16 changes: 14 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/codeready-toolchain/member-operator

require (
github.com/codeready-toolchain/api v0.0.0-20240815232340-d0c164a83d27
github.com/codeready-toolchain/toolchain-common v0.0.0-20240816011540-2184e6268b4a
github.com/codeready-toolchain/api v0.0.0-20241009095520-331aa861d43b
github.com/codeready-toolchain/toolchain-common v0.0.0-20241003135627-55e81430602b
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.5.9
// using latest commit from 'github.com/openshift/api branch release-4.14'
Expand Down Expand Up @@ -43,11 +43,14 @@ require (
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -59,9 +62,12 @@ require (
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
github.com/huandu/xstrings v1.3.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/migueleliasweb/go-github-mock v0.0.18 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
Expand All @@ -76,24 +82,30 @@ require (
github.com/prometheus/procfs v0.9.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/code-generator v0.25.0 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
sigs.k8s.io/controller-tools v0.10.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand Down
Loading

0 comments on commit 8fabc1a

Please sign in to comment.