diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml index 9ae3eae7d..5e20f34cf 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml @@ -44,25 +44,33 @@ 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. + 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. + 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 + 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. + 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. + 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." properties: name: description: Name of a secret within the enclosing namespace @@ -78,6 +86,10 @@ spec: description: ToolchainClusterStatus contains information about the current status of a cluster updated periodically by cluster controller. properties: + apiEndpoint: + description: APIEndpoint is the API endpoint of the remote cluster. + This can be a hostname, hostname:port, IP or IP:port. + type: string conditions: description: Conditions is an array of current cluster conditions. items: @@ -110,6 +122,10 @@ spec: type: object type: array x-kubernetes-list-type: atomic + operatorNamespace: + description: OperatorNamespace is the namespace in which the operator + runs in the remote cluster + type: string required: - conditions type: object diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yaml index 794bc9f22..61ee7aaff 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yaml @@ -368,6 +368,11 @@ spec: description: HostConnection is the status of the connection with the host cluster properties: + apiEndpoint: + description: APIEndpoint is the API endpoint of the + remote cluster. This can be a hostname, hostname:port, + IP or IP:port. + type: string conditions: description: Conditions is an array of current cluster conditions. @@ -403,6 +408,10 @@ spec: type: object type: array x-kubernetes-list-type: atomic + operatorNamespace: + description: OperatorNamespace is the namespace in which + the operator runs in the remote cluster + type: string required: - conditions type: object diff --git a/go.mod b/go.mod index d4366a6a5..6798b5a76 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeready-toolchain/host-operator require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 - github.com/codeready-toolchain/api v0.0.0-20240627084210-f4a765461e75 + github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-bindata/go-bindata v3.1.2+incompatible diff --git a/go.sum b/go.sum index 6c468f90d..ab13f60fd 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codeready-toolchain/api v0.0.0-20240627084210-f4a765461e75 h1:LOrOMTw3bplM+VwzSxi3j9GNseujhcebO/LGr8b95GE= -github.com/codeready-toolchain/api v0.0.0-20240627084210-f4a765461e75/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= +github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb h1:Wc9CMsv0ODZv9dM5qF3OI0mFDO95YNIXV/8oRvoz8aE= +github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a h1:hXS9egkRRCyvUE//MJf+LDhH3mt1DDaWNFwTenex2dA= github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=